4480 files changed, 60329 insertions, 54909 deletions

diff --git a/tests/wpt/metadata/FileAPI/url/url-with-fetch.any.js.ini b/tests/wpt/metadata/FileAPI/url/url-with-fetch.any.js.ini
index 6a3af4e2ece..947e223fb28 100644
--- a/tests/wpt/metadata/FileAPI/url/url-with-fetch.any.js.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-with-fetch.any.js.ini
@@ -14,9 +14,6 @@
   [Revoke blob URL after creating Request, will fetch]
     expected: FAIL
 
-  [Revoke blob URL after calling fetch, fetch should succeed]
-    expected: FAIL
-
 
 [url-with-fetch.any.html]
   [Untitled]
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 0c87f8f92fc..a6a84127237 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -14557,12 +14557,6 @@
      {}
     ]
    ],
-   "pointerevents/extension/pointerevent_coalesced_events_attributes-manual.html": [
-    [
-     "pointerevents/extension/pointerevent_coalesced_events_attributes-manual.html",
-     {}
-    ]
-   ],
    "pointerevents/extension/pointerevent_getPredictedEvents_when_pointerlocked-manual.html": [
     [
      "pointerevents/extension/pointerevent_getPredictedEvents_when_pointerlocked-manual.html",
@@ -119061,6 +119055,18 @@
      {}
     ]
    ],
+   "css/css-flexbox/flex-wrap-006.html": [
+    [
+     "css/css-flexbox/flex-wrap-006.html",
+     [
+      [
+       "/css/reference/ref-filled-green-100px-square.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-flexbox/flexbox-flex-direction-column-reverse.htm": [
     [
      "css/css-flexbox/flexbox-flex-direction-column-reverse.htm",
@@ -136015,6 +136021,18 @@
      {}
     ]
    ],
+   "css/css-position/position-absolute-dynamic-static-position-table-cell.html": [
+    [
+     "css/css-position/position-absolute-dynamic-static-position-table-cell.html",
+     [
+      [
+       "/css/reference/ref-filled-green-100px-square.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-position/position-absolute-dynamic-static-position.html": [
     [
      "css/css-position/position-absolute-dynamic-static-position.html",
@@ -142055,6 +142073,18 @@
      {}
     ]
    ],
+   "css/css-sizing/block-fit-content-as-initial.html": [
+    [
+     "css/css-sizing/block-fit-content-as-initial.html",
+     [
+      [
+       "/css/css-sizing/block-fit-content-as-initial-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-sizing/block-image-percentage-max-height-inside-inline.html": [
     [
      "css/css-sizing/block-image-percentage-max-height-inside-inline.html",
@@ -167563,6 +167593,18 @@
      {}
     ]
    ],
+   "css/css-values/calc-zero-percent-height.html": [
+    [
+     "css/css-values/calc-zero-percent-height.html",
+     [
+      [
+       "/css/reference/ref-filled-green-100px-square-only.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-values/ch-unit-001.html": [
     [
      "css/css-values/ch-unit-001.html",
@@ -203441,18 +203483,6 @@
      {}
     ]
    ],
-   "html/semantics/embedded-content/svg/intrinsicsize/intrinsicsize-svg-image.tentative.html": [
-    [
-     "html/semantics/embedded-content/svg/intrinsicsize/intrinsicsize-svg-image.tentative.html",
-     [
-      [
-       "/html/semantics/embedded-content/svg/intrinsicsize/intrinsicsize-svg-image-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
    "html/semantics/embedded-content/the-audio-element/audio_001.htm": [
     [
      "html/semantics/embedded-content/the-audio-element/audio_001.htm",
@@ -205965,6 +205995,18 @@
      {}
     ]
    ],
+   "mathml/relations/html5-tree/css-inline-style-dynamic.tentative.html": [
+    [
+     "mathml/relations/html5-tree/css-inline-style-dynamic.tentative.html",
+     [
+      [
+       "/mathml/relations/html5-tree/css-inline-style-dynamic.tentative-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "mathml/relations/html5-tree/dynamic-1.html": [
     [
      "mathml/relations/html5-tree/dynamic-1.html",
@@ -206505,6 +206547,18 @@
      {}
     ]
    ],
+   "svg/extensibility/foreignObject/masked.html": [
+    [
+     "svg/extensibility/foreignObject/masked.html",
+     [
+      [
+       "/svg/extensibility/foreignObject/masked-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "svg/extensibility/foreignObject/position-svg-root-in-foreign-object.html": [
     [
      "svg/extensibility/foreignObject/position-svg-root-in-foreign-object.html",
@@ -245544,6 +245598,12 @@
    "css/css-contain/reference/ref-if-there-is-no-red.xht": [
     []
    ],
+   "css/css-contain/support/60x60-green.png": [
+    []
+   ],
+   "css/css-contain/support/60x60-red.png": [
+    []
+   ],
    "css/css-contain/support/blue-100x100.png": [
     []
    ],
@@ -254988,6 +255048,9 @@
    "css/css-sizing/auto-scrollbar-inside-stf-abspos-ref.html": [
     []
    ],
+   "css/css-sizing/block-fit-content-as-initial-ref.html": [
+    []
+   ],
    "css/css-sizing/clone-intrinsic-size-ref.html": [
     []
    ],
@@ -265647,6 +265710,9 @@
    "domxpath/META.yml": [
     []
    ],
+   "domxpath/README.md": [
+    []
+   ],
    "domxpath/xml_xpath_tests.xml": [
     []
    ],
@@ -266739,9 +266805,6 @@
    "feature-policy/README.md": [
     []
    ],
-   "feature-policy/experimental-features/intrinsicsize-with-unsized-media.tentative.https.sub.html.headers": [
-    []
-   ],
    "feature-policy/experimental-features/layout-animations-disabled-tentative.html.headers": [
     []
    ],
@@ -272988,9 +273051,6 @@
    "html/semantics/embedded-content/resources/should-not-load.html": [
     []
    ],
-   "html/semantics/embedded-content/svg/intrinsicsize/intrinsicsize-svg-image-ref.html": [
-    []
-   ],
    "html/semantics/embedded-content/the-area-element/resources/area-download-click.html": [
     []
    ],
@@ -273339,9 +273399,6 @@
    "html/semantics/embedded-content/the-img-element/img-with-containment-and-size-ref.html": [
     []
    ],
-   "html/semantics/embedded-content/the-img-element/intrinsicsize/intrinsicsize-without-unsized-media.tentative.https.sub.html.headers": [
-    []
-   ],
    "html/semantics/embedded-content/the-img-element/ismap/img-ismap-coordinates-iframe-after.html": [
     []
    ],
@@ -273381,9 +273438,6 @@
    "html/semantics/embedded-content/the-object-element/test1.html": [
     []
    ],
-   "html/semantics/embedded-content/the-video-element/intrinsicsize/intrinsicsize-without-unsized-media.tentative.https.sub.html.headers": [
-    []
-   ],
    "html/semantics/embedded-content/the-video-element/video_content-ref.htm": [
     []
    ],
@@ -273402,6 +273456,15 @@
    "html/semantics/forms/autofocus/resources/child-autofocus.html": [
     []
    ],
+   "html/semantics/forms/autofocus/resources/erase-first.css": [
+    []
+   ],
+   "html/semantics/forms/autofocus/resources/frame-with-autofocus-element.html": [
+    []
+   ],
+   "html/semantics/forms/autofocus/resources/moving-autofocus-to-parent.html": [
+    []
+   ],
    "html/semantics/forms/autofocus/resources/utils.js": [
     []
    ],
@@ -275976,6 +276039,9 @@
    "mathml/relations/html5-tree/color-attributes-1-ref.html": [
     []
    ],
+   "mathml/relations/html5-tree/css-inline-style-dynamic.tentative-ref.html": [
+    []
+   ],
    "mathml/relations/html5-tree/dynamic-1-ref.html": [
     []
    ],
@@ -276504,6 +276570,9 @@
    "mixed-content/generic/sanity-checker.js": [
     []
    ],
+   "mixed-content/generic/test-case.sub.js": [
+    []
+   ],
    "mixed-content/generic/tools/__init__.py": [
     []
    ],
@@ -277704,1690 +277773,1975 @@
    "referrer-policy/css-integration/css-test-helper.js": [
     []
    ],
-   "referrer-policy/generic/multiple-headers-and-values.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/generic/multiple-headers-combined.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/generic/multiple-headers-one-invalid.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/generic/multiple-headers-one-unknown-token.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/generic/multiple-headers.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/generic/referrer-policy-test-case.sub.js": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/generic/sanity-checker.js": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/generic/tools/__init__.py": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/generic/tools/clean.py": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/generic/tools/generate.py": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/generic/tools/regenerate": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/fetch/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/fetch/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/fetch/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/fetch/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/fetch/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/fetch/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/fetch/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/fetch/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/fetch/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/fetch/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/fetch/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/fetch/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/img-tag/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/img-tag/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/img-tag/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/img-tag/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/img-tag/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/img-tag/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/script-tag/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/script-tag/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/script-tag/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/script-tag/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/script-tag/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/script-tag/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/worker-module/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/worker-module/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/xhr/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/xhr/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/xhr/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/xhr/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/spec.src.json": [
+   "referrer-policy/gen/top.http-rp/origin/xhr/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/spec_json.js": [
+   "referrer-policy/gen/top.http-rp/origin/xhr/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/xhr/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/xhr/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/xhr/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/xhr/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/xhr/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/origin/xhr/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/fetch/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/img-tag/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/script-tag/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/same-origin/xhr/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.keep-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.swap-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.keep-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.swap-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.keep-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.swap-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.keep-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.swap-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.keep-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.swap-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.keep-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.swap-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.keep-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.swap-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.keep-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html.headers": [
     []
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html.headers": [
+    []
+   ],
+   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/generic/multiple-headers-and-values.html.headers": [
+    []
+   ],
+   "referrer-policy/generic/multiple-headers-combined.html.headers": [
+    []
+   ],
+   "referrer-policy/generic/multiple-headers-one-invalid.html.headers": [
+    []
+   ],
+   "referrer-policy/generic/multiple-headers-one-unknown-token.html.headers": [
+    []
+   ],
+   "referrer-policy/generic/multiple-headers.html.headers": [
+    []
+   ],
+   "referrer-policy/generic/referrer-policy-test-case.sub.js": [
+    []
+   ],
+   "referrer-policy/generic/sanity-checker.js": [
+    []
+   ],
+   "referrer-policy/generic/test-case.sub.js": [
+    []
+   ],
+   "referrer-policy/generic/tools/__init__.py": [
+    []
+   ],
+   "referrer-policy/generic/tools/clean.py": [
+    []
+   ],
+   "referrer-policy/generic/tools/generate.py": [
+    []
+   ],
+   "referrer-policy/generic/tools/regenerate": [
+    []
+   ],
+   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers": [
+    []
+   ],
+   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
+    []
+   ],
+   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers": [
+    []
+   ],
+   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
+    []
+   ],
+   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
+    []
+   ],
+   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
+    []
+   ],
+   "referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
+    []
+   ],
+   "referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
+    []
+   ],
+   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.headers": [
+    []
+   ],
+   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html.headers": [
+    []
+   ],
+   "referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
+    []
+   ],
+   "referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
+    []
+   ],
+   "referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
+    []
+   ],
+   "referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
+    []
+   ],
+   "referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.headers": [
+    []
+   ],
+   "referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.headers": [
+    []
+   ],
+   "referrer-policy/spec.src.json": [
+    []
+   ],
+   "referrer-policy/spec_json.js": [
+    []
+   ],
+   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html.headers": [
+    []
+   ],
+   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
+    []
+   ],
+   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html.headers": [
+    []
+   ],
+   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
+    []
+   ],
+   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers": [
+    []
+   ],
+   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
+    []
+   ],
+   "referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers": [
+    []
+   ],
+   "referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
+    []
+   ],
+   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
+    []
+   ],
+   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
+    []
+   ],
+   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
+    []
+   ],
+   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
     []
    ],
    "remote-playback/META.yml": [
@@ -282270,6 +282624,9 @@
    "svg/extensibility/foreignObject/foreign-object-size-ref.html": [
     []
    ],
+   "svg/extensibility/foreignObject/masked-ref.html": [
+    []
+   ],
    "svg/extensibility/foreignObject/position-svg-root-in-foreign-object-ref.html": [
     []
    ],
@@ -287247,6 +287604,15 @@
    "trusted-types/support/worker.js": [
     []
    ],
+   "trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.https.html.headers": [
+    []
+   ],
+   "trusted-types/trusted-types-eval-reporting-report-only.tentative.https.html.headers": [
+    []
+   ],
+   "trusted-types/trusted-types-eval-reporting.tentative.https.html.headers": [
+    []
+   ],
    "trusted-types/trusted-types-report-only.tentative.https.html.headers": [
     []
    ],
@@ -298104,7 +298470,9 @@
    "IndexedDB/idbobjectstore_createIndex15-autoincrement.htm": [
     [
      "IndexedDB/idbobjectstore_createIndex15-autoincrement.htm",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "IndexedDB/idbobjectstore_createIndex2.htm": [
@@ -299189,6 +299557,40 @@
      {}
     ]
    ],
+   "IndexedDB/transaction-relaxed-durability.tentative.any.js": [
+    [
+     "IndexedDB/transaction-relaxed-durability.tentative.any.html",
+     {
+      "script_metadata": [
+       [
+        "script",
+        "support-promises.js"
+       ],
+       [
+        "timeout",
+        "long"
+       ]
+      ],
+      "timeout": "long"
+     }
+    ],
+    [
+     "IndexedDB/transaction-relaxed-durability.tentative.any.worker.html",
+     {
+      "script_metadata": [
+       [
+        "script",
+        "support-promises.js"
+       ],
+       [
+        "timeout",
+        "long"
+       ]
+      ],
+      "timeout": "long"
+     }
+    ]
+   ],
    "IndexedDB/transaction-requestqueue.htm": [
     [
      "IndexedDB/transaction-requestqueue.htm",
@@ -306652,14 +307054,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -306681,14 +307075,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -306710,14 +307096,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -306739,14 +307117,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -306768,14 +307138,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -306797,14 +307159,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -306826,14 +307180,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -306855,14 +307201,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -306884,14 +307222,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -306913,14 +307243,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -306942,14 +307264,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -306971,14 +307285,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -307000,14 +307306,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -307029,14 +307327,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -307058,14 +307348,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -307087,14 +307369,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -307116,14 +307390,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -307145,14 +307411,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -307174,14 +307432,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -307203,14 +307453,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -307232,14 +307474,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -307261,14 +307495,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -307290,14 +307516,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -307319,14 +307537,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -307348,14 +307558,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -307377,14 +307579,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -307406,14 +307600,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -307435,14 +307621,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -307464,14 +307642,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -307493,14 +307663,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -307522,14 +307684,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -307551,14 +307705,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -307580,14 +307726,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -307609,14 +307747,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -307638,14 +307768,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -307667,14 +307789,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -307696,14 +307810,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -307725,14 +307831,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -307754,14 +307852,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -307783,14 +307873,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -307812,14 +307894,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -308250,14 +308324,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -308279,14 +308345,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -308308,14 +308366,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -308337,14 +308387,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -308366,14 +308408,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -308395,14 +308429,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -308424,14 +308450,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -308453,14 +308471,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -308482,14 +308492,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -308511,14 +308513,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -308540,14 +308534,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -308569,14 +308555,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -308598,14 +308576,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -308627,14 +308597,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -308656,14 +308618,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -308685,14 +308639,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -308754,14 +308700,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -308783,14 +308721,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -308812,14 +308742,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -308841,14 +308763,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -308870,14 +308784,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -308899,14 +308805,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -308928,14 +308826,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -308957,14 +308847,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -308986,14 +308868,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -309015,14 +308889,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -309044,14 +308910,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -309073,14 +308931,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -309102,14 +308952,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -309131,14 +308973,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -309160,14 +308994,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -309189,14 +309015,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -309218,14 +309036,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -309247,14 +309057,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -309276,14 +309078,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -309305,14 +309099,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -309334,14 +309120,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -309363,14 +309141,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -309392,14 +309162,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -309421,14 +309183,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -309450,14 +309204,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -309479,14 +309225,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -309556,14 +309294,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -309585,14 +309315,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -309614,14 +309336,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -309643,14 +309357,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -309672,14 +309378,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -309701,14 +309399,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -309730,14 +309420,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -309791,14 +309473,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -309820,14 +309494,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -309849,14 +309515,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -309878,14 +309536,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -309907,14 +309557,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -309936,14 +309578,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -309965,14 +309599,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -309994,14 +309620,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -310023,14 +309641,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -310052,14 +309662,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -310081,14 +309683,6 @@
       "script_metadata": [
        [
         "script",
-        "/resources/testharness.js"
-       ],
-       [
-        "script",
-        "/resources/testharnessreport.js"
-       ],
-       [
-        "script",
         "/resources/testdriver.js"
        ],
        [
@@ -325746,6 +325340,12 @@
      {}
     ]
    ],
+   "css/css-text/overflow-wrap/overflow-wrap-break-word-white-space-crash.html": [
+    [
+     "css/css-text/overflow-wrap/overflow-wrap-break-word-white-space-crash.html",
+     {}
+    ]
+   ],
    "css/css-text/overflow-wrap/word-wrap-alias.html": [
     [
      "css/css-text/overflow-wrap/word-wrap-alias.html",
@@ -335438,12 +335038,6 @@
      {}
     ]
    ],
-   "domxpath/interfaces.tentative.html": [
-    [
-     "domxpath/interfaces.tentative.html",
-     {}
-    ]
-   ],
    "domxpath/xml_xpath_runner.html": [
     [
      "domxpath/xml_xpath_runner.html",
@@ -346420,12 +346014,6 @@
      {}
     ]
    ],
-   "feature-policy/experimental-features/intrinsicsize-with-unsized-media.tentative.https.sub.html": [
-    [
-     "feature-policy/experimental-features/intrinsicsize-with-unsized-media.tentative.https.sub.html",
-     {}
-    ]
-   ],
    "feature-policy/experimental-features/layout-animations-disabled-tentative.html": [
     [
      "feature-policy/experimental-features/layout-animations-disabled-tentative.html",
@@ -358208,18 +357796,6 @@
      {}
     ]
    ],
-   "html/semantics/embedded-content/the-img-element/intrinsicsize/intrinsicsize-with-responsive-images.tentative.html": [
-    [
-     "html/semantics/embedded-content/the-img-element/intrinsicsize/intrinsicsize-with-responsive-images.tentative.html",
-     {}
-    ]
-   ],
-   "html/semantics/embedded-content/the-img-element/intrinsicsize/intrinsicsize-without-unsized-media.tentative.https.sub.html": [
-    [
-     "html/semantics/embedded-content/the-img-element/intrinsicsize/intrinsicsize-without-unsized-media.tentative.https.sub.html",
-     {}
-    ]
-   ],
    "html/semantics/embedded-content/the-img-element/invalid-src.html": [
     [
      "html/semantics/embedded-content/the-img-element/invalid-src.html",
@@ -358410,12 +357986,6 @@
      {}
     ]
    ],
-   "html/semantics/embedded-content/the-video-element/intrinsicsize/intrinsicsize-without-unsized-media.tentative.https.sub.html": [
-    [
-     "html/semantics/embedded-content/the-video-element/intrinsicsize/intrinsicsize-without-unsized-media.tentative.https.sub.html",
-     {}
-    ]
-   ],
    "html/semantics/embedded-content/the-video-element/video-tabindex.html": [
     [
      "html/semantics/embedded-content/the-video-element/video-tabindex.html",
@@ -358446,6 +358016,18 @@
      {}
     ]
    ],
+   "html/semantics/forms/autofocus/autofocus-on-stable-document.html": [
+    [
+     "html/semantics/forms/autofocus/autofocus-on-stable-document.html",
+     {}
+    ]
+   ],
+   "html/semantics/forms/autofocus/first-reconnected.html": [
+    [
+     "html/semantics/forms/autofocus/first-reconnected.html",
+     {}
+    ]
+   ],
    "html/semantics/forms/autofocus/first-when-later-but-before.html": [
     [
      "html/semantics/forms/autofocus/first-when-later-but-before.html",
@@ -358464,6 +358046,12 @@
      {}
     ]
    ],
+   "html/semantics/forms/autofocus/focusable-area-in-top-document.html": [
+    [
+     "html/semantics/forms/autofocus/focusable-area-in-top-document.html",
+     {}
+    ]
+   ],
    "html/semantics/forms/autofocus/no-cross-origin-autofocus.html": [
     [
      "html/semantics/forms/autofocus/no-cross-origin-autofocus.html",
@@ -358472,18 +358060,66 @@
      }
     ]
    ],
+   "html/semantics/forms/autofocus/no-sandboxed-automatic-features.html": [
+    [
+     "html/semantics/forms/autofocus/no-sandboxed-automatic-features.html",
+     {}
+    ]
+   ],
    "html/semantics/forms/autofocus/not-on-first-task.html": [
     [
      "html/semantics/forms/autofocus/not-on-first-task.html",
      {}
     ]
    ],
+   "html/semantics/forms/autofocus/queue-non-focusable.html": [
+    [
+     "html/semantics/forms/autofocus/queue-non-focusable.html",
+     {}
+    ]
+   ],
+   "html/semantics/forms/autofocus/skip-another-top-level-browsing-context.html": [
+    [
+     "html/semantics/forms/autofocus/skip-another-top-level-browsing-context.html",
+     {}
+    ]
+   ],
+   "html/semantics/forms/autofocus/skip-document-with-fragment.html": [
+    [
+     "html/semantics/forms/autofocus/skip-document-with-fragment.html",
+     {}
+    ]
+   ],
+   "html/semantics/forms/autofocus/skip-non-focusable.html": [
+    [
+     "html/semantics/forms/autofocus/skip-non-focusable.html",
+     {}
+    ]
+   ],
+   "html/semantics/forms/autofocus/skip-not-fully-active.html": [
+    [
+     "html/semantics/forms/autofocus/skip-not-fully-active.html",
+     {}
+    ]
+   ],
+   "html/semantics/forms/autofocus/spin-by-blocking-style-sheet.html": [
+    [
+     "html/semantics/forms/autofocus/spin-by-blocking-style-sheet.html",
+     {}
+    ]
+   ],
    "html/semantics/forms/autofocus/supported-elements.html": [
     [
      "html/semantics/forms/autofocus/supported-elements.html",
      {}
     ]
    ],
+   "html/semantics/forms/autofocus/update-the-rendering.html": [
+    [
+     "html/semantics/forms/autofocus/update-the-rendering.html",
+     {}
+    ]
+   ],
    "html/semantics/forms/constraints/form-validation-checkValidity.html": [
     [
      "html/semantics/forms/constraints/form-validation-checkValidity.html",
@@ -382888,6 +382524,14 @@
      }
     ]
    ],
+   "pointerevents/extension/pointerevent_coalesced_events_attributes.html": [
+    [
+     "pointerevents/extension/pointerevent_coalesced_events_attributes.html",
+     {
+      "testdriver": true
+     }
+    ]
+   ],
    "pointerevents/extension/pointerevent_constructor.html": [
     [
      "pointerevents/extension/pointerevent_constructor.html",
@@ -384333,9675 +383977,10071 @@
      {}
     ]
    ],
-   "referrer-policy/generic/iframe-src-change.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/generic/iframe-src-change.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/generic/inheritance/iframe-inheritance-data.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/generic/inheritance/iframe-inheritance-data.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/generic/inheritance/iframe-inheritance-srcdoc-child.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/generic/inheritance/iframe-inheritance-srcdoc-child.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/generic/link-rel-prefetch.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/generic/link-rel-prefetch.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/generic/multiple-headers-and-values.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/generic/multiple-headers-and-values.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/generic/multiple-headers-combined.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/generic/multiple-headers-combined.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/generic/multiple-headers-one-invalid.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/generic/multiple-headers-one-invalid.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/generic/multiple-headers-one-unknown-token.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/generic/multiple-headers-one-unknown-token.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/generic/multiple-headers.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/generic/multiple-headers.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/generic/subresource-test/area-navigate.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/generic/subresource-test/area-navigate.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/generic/subresource-test/attr-referrer-invalid-value.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/generic/subresource-test/attr-referrer-invalid-value.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/generic/subresource-test/fetch-messaging.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/generic/subresource-test/fetch-messaging.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/generic/subresource-test/iframe-messaging.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/generic/subresource-test/iframe-messaging.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/generic/subresource-test/image-decoding.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/generic/subresource-test/image-decoding.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/generic/subresource-test/link-navigate.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/generic/subresource-test/link-navigate.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/generic/subresource-test/script-messaging.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/generic/subresource-test/script-messaging.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/generic/subresource-test/worker-messaging.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/generic/subresource-test/worker-messaging.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/generic/subresource-test/xhr-messaging.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/generic/subresource-test/xhr-messaging.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/generic/unsupported-csp-referrer-directive.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/generic/unsupported-csp-referrer-directive.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/fetch/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/fetch/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/fetch/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/fetch/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/fetch/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/fetch/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/fetch/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/fetch/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/fetch/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/fetch/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/fetch/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/fetch/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/fetch/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/fetch/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/fetch/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/fetch/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/fetch/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/fetch/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/fetch/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/fetch/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/fetch/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/fetch/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/fetch/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/fetch/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/img-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/img-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/img-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/img-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/img-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/img-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/img-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/img-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/img-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/img-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/img-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/img-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/script-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/script-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/script-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/script-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/script-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/script-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/script-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/script-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/script-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/script-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/script-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/script-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/worker-module/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/worker-module/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/worker-module/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/worker-module/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/xhr/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/xhr/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/xhr/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/xhr/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/xhr/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/xhr/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/xhr/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/xhr/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/xhr/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/xhr/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/xhr/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/xhr/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/xhr/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/xhr/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/xhr/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/xhr/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/xhr/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/xhr/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/xhr/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/xhr/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/xhr/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/xhr/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/origin/xhr/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/origin/xhr/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/fetch/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/fetch/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/img-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/img-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/script-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/script-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/same-origin/xhr/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/same-origin/xhr/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/fetch/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/fetch/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/fetch/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/fetch/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/fetch/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/fetch/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/fetch/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/fetch/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/fetch/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/fetch/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/fetch/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/fetch/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/fetch/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/fetch/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/fetch/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/fetch/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/fetch/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/fetch/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/fetch/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/fetch/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/fetch/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/fetch/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/fetch/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/fetch/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/img-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/img-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/img-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/img-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/img-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/img-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/img-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/img-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/img-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/img-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/img-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/img-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/script-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/script-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/script-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/script-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/script-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/script-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/script-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/script-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/script-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/script-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/script-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/script-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/worker-module/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/worker-module/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/worker-module/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/worker-module/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/xhr/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/xhr/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/xhr/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/xhr/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/xhr/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/xhr/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/xhr/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/xhr/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/xhr/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/xhr/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/xhr/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/xhr/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/xhr/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/xhr/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/xhr/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/xhr/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/xhr/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/xhr/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/xhr/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/xhr/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/xhr/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/xhr/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.http-rp/unset/xhr/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.http-rp/unset/xhr/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/fetch/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/fetch/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/fetch/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/fetch/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/fetch/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/fetch/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/fetch/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/fetch/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/fetch/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/fetch/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/fetch/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/fetch/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/worker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/worker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/worker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/worker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/worker-module/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/worker-module/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/worker-module/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/worker-module/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/xhr/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/xhr/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/xhr/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/xhr/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/xhr/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/xhr/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/xhr/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/xhr/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/xhr/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/xhr/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/no-referrer/xhr/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/no-referrer/xhr/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin/fetch/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin/fetch/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin/fetch/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin/fetch/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin/fetch/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin/fetch/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin/fetch/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin/fetch/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin/fetch/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin/fetch/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin/fetch/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin/fetch/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin/fetch/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin/fetch/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin/fetch/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin/fetch/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin/fetch/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin/fetch/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin/fetch/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin/fetch/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin/fetch/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin/fetch/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin/fetch/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin/fetch/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html": [
+   "referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html",
+     "referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/iframe-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/iframe-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/iframe-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/iframe-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/iframe-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/iframe-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/iframe-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/iframe-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/iframe-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/iframe-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/iframe-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/iframe-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/script-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/script-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/script-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/script-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/script-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/script-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/script-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/script-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/script-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/script-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/script-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/script-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/script-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/script-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/script-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/script-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/script-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/script-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/script-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/script-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/script-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/script-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/script-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/script-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/worker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/worker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/same-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/worker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/same-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/worker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/worker-module/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/worker-module/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/worker-module/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/worker-module/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/xhr/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/xhr/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/xhr/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/xhr/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/xhr/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/xhr/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/xhr/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/xhr/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/xhr/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/xhr/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/xhr/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/xhr/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/xhr/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/xhr/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/origin/xhr/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/origin/xhr/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/origin/xhr/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/origin/xhr/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/origin/xhr/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/origin/xhr/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/origin/xhr/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/origin/xhr/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/origin/xhr/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/origin/xhr/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/fetch/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/same-origin/fetch/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/fetch/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/same-origin/fetch/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/fetch/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/same-origin/fetch/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/fetch/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/same-origin/fetch/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/fetch/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/same-origin/fetch/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/fetch/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/same-origin/fetch/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/fetch/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/same-origin/fetch/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/fetch/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/same-origin/fetch/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/fetch/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/same-origin/fetch/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/fetch/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/same-origin/fetch/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/iframe-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/same-origin/iframe-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/script-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/same-origin/script-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/script-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/same-origin/script-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/script-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/same-origin/script-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/script-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/same-origin/script-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/worker-module/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/same-origin/worker-module/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/worker-module/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/same-origin/worker-module/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/xhr/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/same-origin/xhr/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/xhr/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/same-origin/xhr/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/xhr/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/same-origin/xhr/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/xhr/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/same-origin/xhr/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/xhr/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/same-origin/xhr/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/xhr/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/same-origin/xhr/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/xhr/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/same-origin/xhr/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/xhr/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/same-origin/xhr/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/xhr/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/same-origin/xhr/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/same-origin/xhr/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/same-origin/xhr/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/fetch/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/fetch/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/fetch/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/fetch/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/fetch/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/fetch/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/fetch/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/fetch/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/fetch/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/fetch/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/fetch/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/fetch/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/xhr/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/xhr/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/xhr/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/xhr/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/xhr/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/xhr/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/xhr/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/xhr/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/xhr/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/xhr/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/strict-origin/xhr/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/strict-origin/xhr/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/fetch/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/fetch/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/fetch/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/fetch/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/fetch/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/fetch/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/fetch/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/fetch/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/fetch/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/fetch/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/fetch/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/fetch/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/fetch/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/fetch/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/fetch/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/fetch/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/fetch/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/fetch/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/fetch/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/fetch/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/fetch/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/fetch/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/fetch/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/fetch/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/iframe-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/iframe-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/iframe-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/iframe-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/iframe-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/iframe-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/iframe-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/iframe-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/iframe-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/iframe-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/iframe-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/iframe-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/script-tag/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/script-tag/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/script-tag/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/script-tag/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/script-tag/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/script-tag/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/script-tag/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/script-tag/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/script-tag/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/script-tag/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/script-tag/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/script-tag/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/script-tag/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/script-tag/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/script-tag/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/script-tag/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/script-tag/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/script-tag/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/script-tag/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/script-tag/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/script-tag/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/script-tag/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/script-tag/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/script-tag/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/worker-classic/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/worker-classic/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/worker-classic/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/worker-classic/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/worker-module/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/worker-module/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/worker-module/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/worker-module/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/xhr/cross-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/xhr/cross-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/xhr/cross-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/xhr/cross-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/xhr/cross-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/xhr/cross-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/xhr/cross-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/xhr/cross-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/xhr/cross-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/xhr/cross-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/xhr/cross-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/xhr/cross-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/xhr/same-http.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/xhr/same-http.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/xhr/same-http.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/xhr/same-http.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/xhr/same-http.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/xhr/same-http.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/xhr/same-https.keep-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/xhr/same-https.keep-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/xhr/same-https.no-redirect.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/xhr/same-https.no-redirect.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/gen/top.meta/unset/xhr/same-https.swap-origin.http.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/gen/top.meta/unset/xhr/same-https.swap-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/generic/iframe-src-change.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/generic/iframe-src-change.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/generic/inheritance/iframe-inheritance-data.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/generic/inheritance/iframe-inheritance-data.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/generic/inheritance/iframe-inheritance-srcdoc-child.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/generic/inheritance/iframe-inheritance-srcdoc-child.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/generic/link-rel-prefetch.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/generic/link-rel-prefetch.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/generic/multiple-headers-and-values.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/generic/multiple-headers-and-values.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/generic/multiple-headers-combined.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/generic/multiple-headers-combined.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/generic/multiple-headers-one-invalid.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/generic/multiple-headers-one-invalid.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/generic/multiple-headers-one-unknown-token.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/generic/multiple-headers-one-unknown-token.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/generic/multiple-headers.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/generic/multiple-headers.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/generic/subresource-test/area-navigate.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/generic/subresource-test/area-navigate.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/generic/subresource-test/attr-referrer-invalid-value.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/generic/subresource-test/attr-referrer-invalid-value.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/generic/subresource-test/fetch-messaging.html": [
     [
-     "referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/generic/subresource-test/fetch-messaging.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/generic/subresource-test/iframe-messaging.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/generic/subresource-test/iframe-messaging.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/generic/subresource-test/image-decoding.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/generic/subresource-test/image-decoding.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/generic/subresource-test/link-navigate.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/generic/subresource-test/link-navigate.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/generic/subresource-test/script-messaging.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/generic/subresource-test/script-messaging.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/generic/subresource-test/worker-messaging.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/generic/subresource-test/worker-messaging.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/generic/subresource-test/xhr-messaging.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/generic/subresource-test/xhr-messaging.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/generic/unsupported-csp-referrer-directive.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/generic/unsupported-csp-referrer-directive.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html",
+     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html",
+     "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
+    [
+     "referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html": [
+   "referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html",
+     "referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html": [
+   "referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html",
+     "referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html": [
+   "referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html",
+     "referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html",
+     "referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html": [
+   "referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html",
+     "referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
+   "referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html",
+     "referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
+   "referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html",
+     "referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html",
+     "referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
+   "referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html",
+     "referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html",
+     "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
+   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html",
+     "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html": [
+   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html",
+     "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
+   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html",
+     "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html": [
+    [
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html": [
+    [
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
+   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html",
+     "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
+   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html",
+     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html",
+     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html",
      {}
     ]
    ],
-   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
+   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
     [
-     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html",
+     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+    [
+     "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+    [
+     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+    [
+     "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+    [
+     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+    [
+     "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+    [
+     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
+    [
+     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
+    [
+     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
+    [
+     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+    [
+     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+    [
+     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+    [
+     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+    [
+     "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+    [
+     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
+    [
+     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
+    [
+     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
+    [
+     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+    [
+     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+    [
+     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+    [
+     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+    [
+     "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html",
      {}
     ]
    ],
@@ -404158,6 +404198,12 @@
      {}
     ]
    ],
+   "svg/animations/beginelement-instance-time-1.html": [
+    [
+     "svg/animations/beginelement-instance-time-1.html",
+     {}
+    ]
+   ],
    "svg/animations/change-css-property-while-animating-fill-freeze.html": [
     [
      "svg/animations/change-css-property-while-animating-fill-freeze.html",
@@ -406373,6 +406419,24 @@
      }
     ]
    ],
+   "trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.https.html": [
+    [
+     "trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.https.html",
+     {}
+    ]
+   ],
+   "trusted-types/trusted-types-eval-reporting-report-only.tentative.https.html": [
+    [
+     "trusted-types/trusted-types-eval-reporting-report-only.tentative.https.html",
+     {}
+    ]
+   ],
+   "trusted-types/trusted-types-eval-reporting.tentative.https.html": [
+    [
+     "trusted-types/trusted-types-eval-reporting.tentative.https.html",
+     {}
+    ]
+   ],
    "trusted-types/trusted-types-report-only.tentative.https.html": [
     [
      "trusted-types/trusted-types-report-only.tentative.https.html",
@@ -451026,7 +451090,7 @@
    "testharness"
   ],
   "IndexedDB/idbobjectstore_createIndex15-autoincrement.htm": [
-   "87ea39ce3d240c38359c17b324b11a08441368ee",
+   "c66b81548adb1ef287b2ba075e66d6dbb8e6360b",
    "testharness"
   ],
   "IndexedDB/idbobjectstore_createIndex2.htm": [
@@ -451477,6 +451541,10 @@
    "28836448aca6925b4860f85b52c6c0dbac0214c9",
    "testharness"
   ],
+  "IndexedDB/transaction-relaxed-durability.tentative.any.js": [
+   "c6a6f37ba9e0b29dc17fe66e487920acf2c4ecc6",
+   "testharness"
+  ],
   "IndexedDB/transaction-requestqueue.htm": [
    "9f28e81ea8a65013f4ba9a1992aaff8598418f5f",
    "testharness"
@@ -455750,167 +455818,167 @@
    "support"
   ],
   "bluetooth/adapter/adapter-absent-getAvailability.https.window.js": [
-   "cec09c38b138653297ee1df6ab0811a0575978bc",
+   "a9f540ecd34331271e27b99f74e155f40b41f6ec",
    "testharness"
   ],
   "bluetooth/adapter/adapter-added-getAvailability.https.window.js": [
-   "d5e9d1f2b6ffbb009b03d0cde8155144aeee630b",
+   "30c47201f072206e548cc5ea3417c91383fffcc7",
    "testharness"
   ],
   "bluetooth/adapter/adapter-powered-off-getAvailability.https.window.js": [
-   "8fe9265a46ed22a9bb0e0480f045135b323565f0",
+   "b760d4bc2728212a025b7d8fd1a34c002e62840b",
    "testharness"
   ],
   "bluetooth/adapter/adapter-powered-on-getAvailability.https.window.js": [
-   "8b9256a4c35680722ad2ee00784de6649b703611",
+   "f98a88eea9e1d2e0adb21d616802931af09c2481",
    "testharness"
   ],
   "bluetooth/adapter/adapter-powered-on-off-on-getAvailability.https.window.js": [
-   "b8b49121fc0170eb9dc95614b5c3b19ef16bd02b",
+   "ac664a8981267007ada522bfd610209995dbfe16",
    "testharness"
   ],
   "bluetooth/adapter/adapter-removed-getAvailability.https.window.js": [
-   "cc2c33d1d4c2bf2cdad0cd0874a739b462ff90ec",
+   "00425aa56f25fb208503c46cb12a2f422ee141f5",
    "testharness"
   ],
   "bluetooth/adapter/cross-origin-iframe-getAvailability.sub.https.window.js": [
-   "bf5e4226e08d44e521b533f020c0deaa95851983",
+   "ce633c63f981921cbb9ea2ab5f2f71a839cb8acb",
    "testharness"
   ],
   "bluetooth/characteristic/characteristicProperties.https.window.js": [
-   "abe9f79ce26ed7cc9f5c17cfd2f0e1e70d1d3657",
+   "5239accab97942ea1ff8e1cccd3bc383977e915d",
    "testharness"
   ],
   "bluetooth/characteristic/getDescriptor/gen-characteristic-is-removed.https.window.js": [
-   "97256a4533007d9c52ec395ba5a811c212aaf48c",
+   "eb91e972c4e537f6eea30c844358ef4a30d911eb",
    "testharness"
   ],
   "bluetooth/characteristic/getDescriptor/gen-descriptor-get-same-object.https.window.js": [
-   "8847efab3c1565150110155f3fcbf11c54003846",
+   "4cff64bbdad180314b76784ea4f0720ba6df83fd",
    "testharness"
   ],
   "bluetooth/characteristic/getDescriptor/gen-service-is-removed.https.window.js": [
-   "b9dc92482ab6f4f564c322c2fa9b19198e576e33",
+   "f5d1761994abc3800dbc6e62ee4357fbceeb26f5",
    "testharness"
   ],
   "bluetooth/characteristic/getDescriptors/gen-characteristic-is-removed-with-uuid.https.window.js": [
-   "25bde7cecc5fbfa7d83bf5fd5c29f551598a2d43",
+   "7405a8ee6e3a5fc4a78061b30f98608b2946f545",
    "testharness"
   ],
   "bluetooth/characteristic/getDescriptors/gen-characteristic-is-removed.https.window.js": [
-   "c3ff9f6a05c625da3ffc4ab5bdab3a6bab82f524",
+   "470f7043be314bf6e7c0678806c948cb0591e2ed",
    "testharness"
   ],
   "bluetooth/characteristic/getDescriptors/gen-descriptor-get-same-object.https.window.js": [
-   "c997d7afda2c1faef8fe2e33ac430286334edd4d",
+   "1dc58aea155206df60f567bbba3560887d6f24a0",
    "testharness"
   ],
   "bluetooth/characteristic/getDescriptors/gen-service-is-removed-with-uuid.https.window.js": [
-   "03bb51239dccd4ca479f8159052086c2c0c1c285",
+   "5ee7e0d24943bc939ee2a2b9bbf7940d212d1218",
    "testharness"
   ],
   "bluetooth/characteristic/getDescriptors/gen-service-is-removed.https.window.js": [
-   "762f9cc99554aa206f7cf4c767c2db5dbdb0634c",
+   "24a2087e938fed32a63c9b0fed8ca20b437be6b4",
    "testharness"
   ],
   "bluetooth/characteristic/notifications/characteristic-is-removed.https.window.js": [
-   "6b5d3e22a121e64c75e217e73631c7cd6ad86865",
+   "2ab165d9044520d62f4d4fb334b4f148c865ecab",
    "testharness"
   ],
   "bluetooth/characteristic/notifications/service-is-removed.https.window.js": [
-   "29bc671c5d4c9e27e4fc59b4dee520a494770cd8",
+   "d2456934d83dc75720dff84429932a157094cf56",
    "testharness"
   ],
   "bluetooth/characteristic/readValue/add-multiple-event-listeners.https.window.js": [
-   "7e6e4159bb11234b01162b3daf080143c0055252",
+   "13709ea941ed5ca54f6b2e38d4017afa3c9995c2",
    "testharness"
   ],
   "bluetooth/characteristic/readValue/characteristic-is-removed.https.window.js": [
-   "07678e6e037b211ee9560a6c1af02465e7cc4e11",
+   "269f2cb4a1f010a972a156090763ebb152fcb5c2",
    "testharness"
   ],
   "bluetooth/characteristic/readValue/event-is-fired.https.window.js": [
-   "eee34d0612d3611121d219c0b4098937df507ece",
+   "03b8f2b4cee8ec0c77630d15dbb7df711921f6c4",
    "testharness"
   ],
   "bluetooth/characteristic/readValue/gen-characteristic-is-removed.https.window.js": [
-   "a2de3c39e20626b617926618da10acfb5f81a83d",
+   "26efe8b306b4a99e7ac4a34f153c1b909f029cf7",
    "testharness"
   ],
   "bluetooth/characteristic/readValue/read-succeeds.https.window.js": [
-   "aeece7d11f480e5cf7122ef97bc9eb098a7da883",
+   "82be128f31242ccc55a761c09a992a1132064faa",
    "testharness"
   ],
   "bluetooth/characteristic/readValue/read-updates-value.https.window.js": [
-   "45da8af25020374c8b876984017fbefc95f4b8f1",
+   "34da455ddff4a91ee16f969b096f7821fb2d00bc",
    "testharness"
   ],
   "bluetooth/characteristic/readValue/service-is-removed.https.window.js": [
-   "07e9701d3c321dfdf166195ec4eab6c2f354f216",
+   "20dd4ba1c05e5850f16234d693c32dab0350bd4e",
    "testharness"
   ],
   "bluetooth/characteristic/service-same-from-2-characteristics.https.window.js": [
-   "e3bc5d0e103d66368db4b294e3e09d8a9018b792",
+   "b34b3b9216abec77727dcda84a83e07f3eedb210",
    "testharness"
   ],
   "bluetooth/characteristic/service-same-object.https.window.js": [
-   "6b1f543ae5e9944d4792a01209417016f4566a2e",
+   "b58902ae51957b91ee63eb4f53acd1c0e353f7ef",
    "testharness"
   ],
   "bluetooth/characteristic/startNotifications/gen-characteristic-is-removed.https.window.js": [
-   "76b2d42a481f1f73ba869e2350627c080531bf7e",
+   "af27f933d8f10207caf1574befa6d9f64767fc45",
    "testharness"
   ],
   "bluetooth/characteristic/writeValue/buffer-is-detached.https.window.js": [
-   "35347e3bcf8fdc3c895e6daea5d9b7247cbcfcac",
+   "cefbb6ee8c349d80d0dd8bc20fe370a771d02916",
    "testharness"
   ],
   "bluetooth/characteristic/writeValue/characteristic-is-removed.https.window.js": [
-   "33a963bed0950485a06685df8a601025bd4c419c",
+   "c0f5a3e6509c91efb5dae8cb9a3b07875ab6051b",
    "testharness"
   ],
   "bluetooth/characteristic/writeValue/gen-characteristic-is-removed.https.window.js": [
-   "00c50894e5bb1e444ecc02c441d6bd6343ccdd58",
+   "d5ac10fc611443cdde02761448e6f479390bf790",
    "testharness"
   ],
   "bluetooth/characteristic/writeValue/service-is-removed.https.window.js": [
-   "a9f812c137f236ac088fbf42886c44e92eabafc4",
+   "e7a2837c389a1076b548dc5256fe78eaa1059162",
    "testharness"
   ],
   "bluetooth/characteristic/writeValue/write-succeeds.https.window.js": [
-   "1472c619a2dbdf5c8536e240ff024349a6e938ea",
+   "cdda9cec345b81297966b74ab2152f02010ec6b7",
    "testharness"
   ],
   "bluetooth/descriptor/readValue/gen-service-is-removed.https.window.js": [
-   "3b6c78a97c586fd02da2ccd53c81291b79512f8c",
+   "aa95687094b50340503d8cc5bcdeaec7e5bf3bdf",
    "testharness"
   ],
   "bluetooth/descriptor/readValue/read-succeeds.https.window.js": [
-   "5f3c5f8f084c11639ea86f7332d03f56e7c72b4e",
+   "fc1facaf58e37550c4fb9a4d5b66f2180072cbe8",
    "testharness"
   ],
   "bluetooth/descriptor/writeValue/buffer-is-detached.https.window.js": [
-   "23ea2329a64f4da8a4cc5cd4a9de7ed0a7b6047e",
+   "2ff277ec9496e73961c9f8efa903f465d2fa776b",
    "testharness"
   ],
   "bluetooth/descriptor/writeValue/gen-service-is-removed.https.window.js": [
-   "ca75ebaba8867c0ede9ed743537ace2b702f095d",
+   "a486819b55a114e9e4bbde31b709cf00c7aae1c5",
    "testharness"
   ],
   "bluetooth/device/gattserverdisconnected-event/disconnected.https.window.js": [
-   "245e43d31504a555af42971b87978a4f48c949a2",
+   "dab54d5da2961eae72d6bd05eb15023dd8a2a46a",
    "testharness"
   ],
   "bluetooth/device/gattserverdisconnected-event/disconnected_gc.https.window.js": [
-   "69e30443ee6f505fbd2a4623457251ac564bcb4b",
+   "a15cc943f4e1180ea092e24db9112658b40c5b99",
    "testharness"
   ],
   "bluetooth/device/gattserverdisconnected-event/one-event-per-disconnection.https.window.js": [
-   "317eddee9ba86d6b1357ce6a845b2b99c78d15da",
+   "f5e45f99755dbd05f24cbca9584d67e5e6654c32",
    "testharness"
   ],
   "bluetooth/device/gattserverdisconnected-event/reconnect-during-disconnected-event.https.window.js": [
-   "93a46eeb934f0ebef9ff378ed7f9e59379d9d094",
+   "8f264c7b02524a84ac67e6fbe343045ae8eb07a6",
    "testharness"
   ],
   "bluetooth/generate.py": [
@@ -456106,7 +456174,7 @@
    "support"
   ],
   "bluetooth/script-tests/base_test_js.template": [
-   "56971d2c6c98faaf479f3a89fb0757e85bf9b42c",
+   "c0fa4aed552db72575b8344c7e495680eac84916",
    "support"
   ],
   "bluetooth/script-tests/characteristic/characteristic-is-removed.js": [
@@ -456250,67 +456318,67 @@
    "testharness"
   ],
   "bluetooth/server/getPrimaryService/gen-disconnect-called-before.https.window.js": [
-   "2d94b41e0207689824be914a21ef7fab4f866d10",
+   "1eb62d3a3118e9c63decb6d82aeb0aa906e396f3",
    "testharness"
   ],
   "bluetooth/server/getPrimaryService/gen-disconnect-called-during-error.https.window.js": [
-   "0d6e8a7a179070c7d4a023ad550d8b25f3a3bcdf",
+   "c7c80244193016db84dbbf8e9f3441e2a4937b96",
    "testharness"
   ],
   "bluetooth/server/getPrimaryService/gen-disconnect-called-during-success.https.window.js": [
-   "18af59d7f803a5a7adbcf1658a4449302b5d8291",
+   "5655d8ee41cd1765f105772f42dcacfcf0a27e6f",
    "testharness"
   ],
   "bluetooth/server/getPrimaryService/gen-disconnect-invalidates-objects.https.window.js": [
-   "5cfe893f5d81ca2a6c07ec02e4c29ab96b594175",
+   "c95f8b921a74eeedf06f8c987bd233ca97c060fb",
    "testharness"
   ],
   "bluetooth/server/getPrimaryService/gen-disconnected-device.https.window.js": [
-   "622f2cf3212cf66f11545e157e0fa389c7f5f3d8",
+   "e610b715b3aae554bec472cc5fcc74d3fc4fb7ad",
    "testharness"
   ],
   "bluetooth/server/getPrimaryService/gen-discovery-complete-no-permission-absent-service.https.window.js": [
-   "5afb0262658249caee332d8988f62a5da8829865",
+   "ee3cf97f4db9f68cffac91c55bf282ab54b8906b",
    "testharness"
   ],
   "bluetooth/server/getPrimaryService/gen-discovery-complete-service-not-found.https.window.js": [
-   "86fa5e9b011b8c4c08ffad135a5e893c138c4e4b",
+   "5bf720cd48eb0eeec5f89488384f078ce37c9cd6",
    "testharness"
   ],
   "bluetooth/server/getPrimaryService/gen-garbage-collection-ran-during-error.https.window.js": [
-   "2c35c1b7556297c4d595f451662ed6df7d09df77",
+   "4c3111720c2c69d8e5e867bf4a3288ea1aba8115",
    "testharness"
   ],
   "bluetooth/server/getPrimaryService/gen-garbage-collection-ran-during-success.https.window.js": [
-   "cca8c2c5d2f2bf0c5f758b4299d54ca2a1f76e4d",
+   "fe7d749063d8d75da9c389fffbe9dc68af9a30a2",
    "testharness"
   ],
   "bluetooth/server/getPrimaryService/gen-get-different-service-after-reconnection.https.window.js": [
-   "a0f073d8a314ea9574a9187a6b97c39fd7c1fdad",
+   "301658c73bb8e4db78433c4072b83aa5f99d629a",
    "testharness"
   ],
   "bluetooth/server/getPrimaryService/gen-get-same-object.https.window.js": [
-   "3deb387406e4fd197890422d77c1b0e288b9ad3a",
+   "c46a1a52c031373b16718d3687a013109f45da62",
    "testharness"
   ],
   "bluetooth/server/getPrimaryService/gen-invalid-service-name.https.window.js": [
-   "d59e202d71cc3d4b8876ebbdef188170fdaa339f",
+   "704ab8bb2dac944d1a3e2a33b57c225edc994225",
    "testharness"
   ],
   "bluetooth/server/getPrimaryService/gen-no-permission-absent-service.https.window.js": [
-   "89ca46884478194b5e0b447bbe51810ea8217cd7",
+   "8daab29eaf94bbae9e28a921a5a650f858ccdd7a",
    "testharness"
   ],
   "bluetooth/server/getPrimaryService/gen-no-permission-for-any-service.https.window.js": [
-   "fec0055dcdb7ab1c11b44388d2ea4b2972e19910",
+   "d55dee753cf8b000089f1d8a5a21f383587427cd",
    "testharness"
   ],
   "bluetooth/server/getPrimaryService/gen-no-permission-present-service.https.window.js": [
-   "a0161a0446b37b00ba351eaff67ba5f6c4a53cda",
+   "d357a214dfd68723571c014d29f8f2e65773a245",
    "testharness"
   ],
   "bluetooth/server/getPrimaryService/gen-service-not-found.https.window.js": [
-   "60fb4f2c529443eb06e28118cf506d5fff12bfd8",
+   "32350e779dce890573bcf519ac74023818296f3e",
    "testharness"
   ],
   "bluetooth/server/getPrimaryService/service-found.https.html": [
@@ -456334,107 +456402,107 @@
    "testharness"
   ],
   "bluetooth/server/getPrimaryServices/gen-disconnect-called-before-with-uuid.https.window.js": [
-   "86a346d14839efc6a5baa913c430328517780d67",
+   "ad446499cbabf6efa98a8d4fb65aeebc1dc22da5",
    "testharness"
   ],
   "bluetooth/server/getPrimaryServices/gen-disconnect-called-before.https.window.js": [
-   "97e9f77d12e668021ca6303eb669666ec16b787d",
+   "485dbb30421e31108e256cd2f7a57ad2a27bfab5",
    "testharness"
   ],
   "bluetooth/server/getPrimaryServices/gen-disconnect-called-during-error-with-uuid.https.window.js": [
-   "37394075d80cf113bec492d02c48e7e2ba394651",
+   "230325a8c76169a545010fb784999599e77463ad",
    "testharness"
   ],
   "bluetooth/server/getPrimaryServices/gen-disconnect-called-during-error.https.window.js": [
-   "9c7aac67a4a3e1fba531a817973daf211e5e9fab",
+   "dce13c5d0065b26c082d042cb92c0cc2ac01f63e",
    "testharness"
   ],
   "bluetooth/server/getPrimaryServices/gen-disconnect-called-during-success-with-uuid.https.window.js": [
-   "bffcea4e9fb3b1e6367bbc353f36dd4ccd7d3855",
+   "8e2e32ba4fddc843378c901e0ce933c54105a539",
    "testharness"
   ],
   "bluetooth/server/getPrimaryServices/gen-disconnect-called-during-success.https.window.js": [
-   "162a61f3eb5f15a1b152eb8d6d4d3b0463beea3c",
+   "78dcffdcbb1861df8cfd7dc6108b40bbb9f57d1e",
    "testharness"
   ],
   "bluetooth/server/getPrimaryServices/gen-disconnect-invalidates-objects-with-uuid.https.window.js": [
-   "05dce42424d02d7dd6a47d867189be3fdd827ea3",
+   "d9f61674671bf0c31776af26c6c477578e6760b6",
    "testharness"
   ],
   "bluetooth/server/getPrimaryServices/gen-disconnect-invalidates-objects.https.window.js": [
-   "e17162a71987c291060199dd156e64033d6829b7",
+   "b1c9688cc14e68069eac95e8a9b1cc272cf1f527",
    "testharness"
   ],
   "bluetooth/server/getPrimaryServices/gen-disconnected-device-with-uuid.https.window.js": [
-   "3bfa60d8ccb3e6e5403b06d0d1d1fa82a52fc284",
+   "8d64dafb760e2d04d4d9dd3c2f9db7e167ffe718",
    "testharness"
   ],
   "bluetooth/server/getPrimaryServices/gen-disconnected-device.https.window.js": [
-   "7072b3efb1f7aeeb8d07eb2c5ff01f045859dad4",
+   "9c411120a0446017e85ce151b96f31bdabb9b8f9",
    "testharness"
   ],
   "bluetooth/server/getPrimaryServices/gen-discovery-complete-no-permission-absent-service-with-uuid.https.window.js": [
-   "589ebe386444f2f50820034a737c8a30cdbe5060",
+   "130657d228f4c7cada6d27a2ad8ff7fee403d9e0",
    "testharness"
   ],
   "bluetooth/server/getPrimaryServices/gen-discovery-complete-service-not-found-with-uuid.https.window.js": [
-   "15b8b978040129b6bc416d838b317ca97fc1219b",
+   "3817a1a5a38723ce08e1650155c5fcd81ff54bdb",
    "testharness"
   ],
   "bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-error-with-uuid.https.window.js": [
-   "17495d24ebadcd9752b06201a7035f45cfcb3635",
+   "c986835ce31dcf5049e54bf553c3b12dac7151d5",
    "testharness"
   ],
   "bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-error.https.window.js": [
-   "741cd2171f894c99bdfa9fa506a62e1bd2488218",
+   "bd438db09e350a0d7ee330a6c3eaa54f1fea02ba",
    "testharness"
   ],
   "bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-success-with-uuid.https.window.js": [
-   "1ee4f21ccba63ef5806840934248c7a6d6def35f",
+   "3b441cedeff36c6b854bc4ea4e7952eac6284d1a",
    "testharness"
   ],
   "bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-success.https.window.js": [
-   "285b774c4e70557f8f14b05c4d9de2b8276a945f",
+   "1b3302a1ba6ffe049e44228280c652bf74310a50",
    "testharness"
   ],
   "bluetooth/server/getPrimaryServices/gen-get-different-service-after-reconnection-with-uuid.https.window.js": [
-   "eb20e6f4b2f8fc2193b2f566eb8b7952747c495c",
+   "378ade0c90b5d7c49c31bb58efaa835b4c502d95",
    "testharness"
   ],
   "bluetooth/server/getPrimaryServices/gen-get-different-service-after-reconnection.https.window.js": [
-   "14fc656c70dd4352aa4d2ab53e98015dd2704978",
+   "bdef5aa2f20ae4971784a566135ecc6b71fc03ca",
    "testharness"
   ],
   "bluetooth/server/getPrimaryServices/gen-get-same-object-with-uuid.https.window.js": [
-   "f3fc4906b44eec68feebcd289320a54fba682246",
+   "aca34e58ff06dd92d15b0bb1d09f81aa8c77402c",
    "testharness"
   ],
   "bluetooth/server/getPrimaryServices/gen-get-same-object.https.window.js": [
-   "c7c488a18b9413e488680b431361981beacb5c1a",
+   "0ea805e339d4dff1dea445e99cc8d661a7f8404a",
    "testharness"
   ],
   "bluetooth/server/getPrimaryServices/gen-invalid-service-name.https.window.js": [
-   "025f1ccdf7c832343d6631e7a85452f7390c5c16",
+   "eeb6dd4dcf867345ff4cfad28b19a9ffa3fb509b",
    "testharness"
   ],
   "bluetooth/server/getPrimaryServices/gen-no-permission-absent-service-with-uuid.https.window.js": [
-   "6f1bb251723a6fda193fe3f0428d730da416506c",
+   "c755dd7129df5ac3825e07d7c7b3d11e2a227f12",
    "testharness"
   ],
   "bluetooth/server/getPrimaryServices/gen-no-permission-for-any-service-with-uuid.https.window.js": [
-   "4bbddeae56ef7fa18656133191abc0e6b2bce1ca",
+   "03b7f2329c8d90fb326bf851c5275f42d2dc2007",
    "testharness"
   ],
   "bluetooth/server/getPrimaryServices/gen-no-permission-for-any-service.https.window.js": [
-   "40b8b576ff4fc57b53a544a5c863985630bbe5ea",
+   "e50c6d56128489fdde8475979ff8868f41d365a1",
    "testharness"
   ],
   "bluetooth/server/getPrimaryServices/gen-no-permission-present-service-with-uuid.https.window.js": [
-   "6f737ecf889d9f96c0e28851c2eb9f5782522fd9",
+   "c703d0a936394d951a84d03ace7bc0b4d80abc7c",
    "testharness"
   ],
   "bluetooth/server/getPrimaryServices/gen-service-not-found-with-uuid.https.window.js": [
-   "33946d281bd8219f4dd07a7a2166f626187c10cf",
+   "9dc1877f9f2753862d106c4dad9830fddd6898f4",
    "testharness"
   ],
   "bluetooth/server/getPrimaryServices/services-found-with-uuid.https.html": [
@@ -456462,31 +456530,31 @@
    "testharness"
   ],
   "bluetooth/service/getCharacteristic/gen-blocklisted-characteristic.https.window.js": [
-   "04176f1ecdadcdfa6214468973d9d52c2f074c90",
+   "72b9bac63a437b7367f10e772f4f598d491b2823",
    "testharness"
   ],
   "bluetooth/service/getCharacteristic/gen-characteristic-not-found.https.window.js": [
-   "cfec509c49205dd407cfe5b114800d1c65f87c8a",
+   "a8b2ef892c768476675c79f70fb3d546d019c4b1",
    "testharness"
   ],
   "bluetooth/service/getCharacteristic/gen-garbage-collection-ran-during-error.https.window.js": [
-   "9543a5e56337ad970a2ab29ef7d2cd2b3ad5c584",
+   "7457161faa09235acfdc609df7e8e4d39fa4ebf7",
    "testharness"
   ],
   "bluetooth/service/getCharacteristic/gen-get-same-object.https.window.js": [
-   "73691befa52f79c6739f2e1763569afce4a61c46",
+   "54ab061deb9eb522dbed1f3d95d1ad485a26ea04",
    "testharness"
   ],
   "bluetooth/service/getCharacteristic/gen-invalid-characteristic-name.https.window.js": [
-   "d21dcf561224906c05e7dacd323f81bab7e408d1",
+   "8f44ecb08be4ff6ec2cc563b32038622dfc8f26d",
    "testharness"
   ],
   "bluetooth/service/getCharacteristic/gen-reconnect-during.https.window.js": [
-   "6f86214246457a68fe383ff2aa148f533f547a72",
+   "da5462a8bfa53a7a124a87c46fe9d30c7aedb83b",
    "testharness"
   ],
   "bluetooth/service/getCharacteristic/gen-service-is-removed.https.window.js": [
-   "b6d6a9df96e73b53008c2655bf524c0d1fe2f687",
+   "0fe5b01146ebbc57172435dfe49e887ac6ad2d1b",
    "testharness"
   ],
   "bluetooth/service/getCharacteristics/blocklisted-characteristics.https.html": [
@@ -456506,47 +456574,47 @@
    "testharness"
   ],
   "bluetooth/service/getCharacteristics/gen-blocklisted-characteristic-with-uuid.https.window.js": [
-   "3afd294d5b12755b4401287d2ff818e4c50f7f38",
+   "cd8a6fa380aade14eb256fb8440d15b6e7352ca2",
    "testharness"
   ],
   "bluetooth/service/getCharacteristics/gen-characteristic-not-found-with-uuid.https.window.js": [
-   "549f6b2671940e0a132fa3b2123ae24be9a912c7",
+   "fff2bd038a82698748acadaa3e85047bd77c79f1",
    "testharness"
   ],
   "bluetooth/service/getCharacteristics/gen-garbage-collection-ran-during-error-with-uuid.https.window.js": [
-   "643e2f839efabbc2e907e20b062903e13dc2be92",
+   "925786c74deab9ad66080391652b60eba00598ee",
    "testharness"
   ],
   "bluetooth/service/getCharacteristics/gen-garbage-collection-ran-during-error.https.window.js": [
-   "b7db67f613f65f43dcb078740302d2fed08c4ded",
+   "d0ecff89f706b1bb4251232a369ea45b70e2e517",
    "testharness"
   ],
   "bluetooth/service/getCharacteristics/gen-get-same-object-with-uuid.https.window.js": [
-   "15b552af4913a45235ac196111692764f07691ef",
+   "fb3346dc4e4c1ca8cb601c41e8f120ccfdb149c3",
    "testharness"
   ],
   "bluetooth/service/getCharacteristics/gen-get-same-object.https.window.js": [
-   "df30d514f39adaa3e6d42747cf7c13a247011992",
+   "576e0831501faa8b838081a96ef437abda2ed668",
    "testharness"
   ],
   "bluetooth/service/getCharacteristics/gen-invalid-characteristic-name.https.window.js": [
-   "f980ac03d5f4e5c2c9e1036eda709245c2836d27",
+   "5b2bd39d3e052cb689bc2f668e87515563d4fa33",
    "testharness"
   ],
   "bluetooth/service/getCharacteristics/gen-reconnect-during-with-uuid.https.window.js": [
-   "eb4233764aaadc4389ebe9518b1eb89c882ce68c",
+   "95f22b11fcf8a5237c7bf0c2b3c40a3d2932b5be",
    "testharness"
   ],
   "bluetooth/service/getCharacteristics/gen-reconnect-during.https.window.js": [
-   "a6d38805973a7638c36dfd09af6d566280576b44",
+   "184632f1d0581e76aed99bcb9a645c837b88af1f",
    "testharness"
   ],
   "bluetooth/service/getCharacteristics/gen-service-is-removed-with-uuid.https.window.js": [
-   "527eb76527696505dde06078b11985499cb74ed1",
+   "6ff7b4f3631e669cf192e3864fe5bbef1d27f23c",
    "testharness"
   ],
   "bluetooth/service/getCharacteristics/gen-service-is-removed.https.window.js": [
-   "466503241ed098f063b59b6317e112434ac04c47",
+   "b4492885b83016d719161f705a33f7ada8a6d9c2",
    "testharness"
   ],
   "check_stability.ini": [
@@ -456954,11 +457022,11 @@
    "support"
   ],
   "common/security-features/README.md": [
-   "a2ae9aa8e16bcd30328a37721d7ec7adf5ebbfbf",
+   "deac1ccd8953beccee632625690275d2fa180b8c",
    "support"
   ],
   "common/security-features/resources/common.js": [
-   "7afa6068bf427641fb09a4b6f84f4cc9ba70e420",
+   "6986f841a8827226b38745722a38ace4b0e3ea46",
    "support"
   ],
   "common/security-features/resources/common.js.headers": [
@@ -457078,11 +457146,11 @@
    "support"
   ],
   "common/security-features/tools/generate.py": [
-   "0b18a391a62279680e2cbb6905d41084a622f236",
+   "0cf7fab42ec199b5f93926a5133ff149bff93c8c",
    "support"
   ],
   "common/security-features/tools/spec_validator.py": [
-   "2c9664788699676a27e2715344ba581f35c89ad7",
+   "fff4c5dd6f688a733c1a48c5fe818f7f2979c8dd",
    "support"
   ],
   "common/security-features/tools/template/disclaimer.template": [
@@ -457102,7 +457170,7 @@
    "support"
   ],
   "common/security-features/tools/util.py": [
-   "fc8d3b30ef71ca3b63c325837cf58f768f5805f4",
+   "57e95fea0784d94452b7bb437c5ddebedd95c721",
    "support"
   ],
   "common/sleep.py": [
@@ -546994,27 +547062,27 @@
    "reftest"
   ],
   "css/css-contain/contain-size-replaced-004-ref.html": [
-   "eba5e8cb9a81b14895af3e6a9b5b2f425e23d74a",
+   "56ca5d2e50e73e38f57c4b4332c8bf02225502d2",
    "support"
   ],
   "css/css-contain/contain-size-replaced-004.html": [
-   "511edadc4f8f1130802b2c179448bad6e7552593",
+   "9f84481504660e4129f10532c761b04fc2030f3f",
    "reftest"
   ],
   "css/css-contain/contain-size-replaced-005-ref.html": [
-   "a5328c79ac60e24fc05f8c8027247ad9fb8d619c",
+   "178e137cb72a1dec8724265e23ccf8b1820e7628",
    "support"
   ],
   "css/css-contain/contain-size-replaced-005.html": [
-   "e889dcc903cc47f4fc59cd65ab313912b8d6e72c",
+   "754f3608e3a8bf17cbfa12cd7418e12f79f12fa0",
    "reftest"
   ],
   "css/css-contain/contain-size-replaced-006-ref.html": [
-   "2f638d7fe428efe8f326a1ba34337853243d6937",
+   "d6753c0694b1ae145f50c39cee1ec64abdf2ea5e",
    "support"
   ],
   "css/css-contain/contain-size-replaced-006.html": [
-   "dccb799ea87433e0442539e11c3a5934e4b59e2e",
+   "f716ce42a89202a9a4209fed18de407d8ed15ce7",
    "reftest"
   ],
   "css/css-contain/contain-size-scrollbars-001.html": [
@@ -547393,6 +547461,14 @@
    "a5b4e9f47a8e60ad0bede1ac81e02b3542c80f3b",
    "support"
   ],
+  "css/css-contain/support/60x60-green.png": [
+   "b3c8cf3eb4c89bd8f2d1ffde051856f375e3a3de",
+   "support"
+  ],
+  "css/css-contain/support/60x60-red.png": [
+   "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
+   "support"
+  ],
   "css/css-contain/support/blue-100x100.png": [
    "3b72d5ce53c07b68fe508bb57aa61a933dbda768",
    "support"
@@ -550761,6 +550837,10 @@
    "fb897f21c67dcb630c5eac346687b78f8f5e244a",
    "reftest"
   ],
+  "css/css-flexbox/flex-wrap-006.html": [
+   "e616412c2b2f1bd35d9f86800551f2a2065a9265",
+   "reftest"
+  ],
   "css/css-flexbox/flex-wrap_nowrap.html": [
    "ef53bb2decb00a9ee881ddcc96d350428b036595",
    "visual"
@@ -570585,6 +570665,10 @@
    "98b18efcf96d12581583b7a74b1437b41aaa9a2f",
    "reftest"
   ],
+  "css/css-position/position-absolute-dynamic-static-position-table-cell.html": [
+   "3a28b205f243df84190cec492dabad239b0a3d66",
+   "reftest"
+  ],
   "css/css-position/position-absolute-dynamic-static-position.html": [
    "35d5f65055d09b377e55a7d3e5dcaf8d3b609a39",
    "reftest"
@@ -575941,6 +576025,14 @@
    "9479b2eb3f51aed98741beadff4a8407b3ae9f33",
    "reftest"
   ],
+  "css/css-sizing/block-fit-content-as-initial-ref.html": [
+   "7fdc142534eb768cb403666614d1c3df8cc1d7bb",
+   "support"
+  ],
+  "css/css-sizing/block-fit-content-as-initial.html": [
+   "7c9422cb5bc761eb0ccbf39449e227e2f70a48ed",
+   "reftest"
+  ],
   "css/css-sizing/block-image-percentage-max-height-inside-inline.html": [
    "2f6ad684c1fb0be5498dc6a5b938da67adfe3ec7",
    "reftest"
@@ -581409,6 +581501,10 @@
    "39426d0420287a730dcac47696bd69520e8a6b72",
    "testharness"
   ],
+  "css/css-text/overflow-wrap/overflow-wrap-break-word-white-space-crash.html": [
+   "2bea6aed780679f9eb0de3130e3acf4ffa2b9e98",
+   "testharness"
+  ],
   "css/css-text/overflow-wrap/overflow-wrap-cluster-001.html": [
    "7911a1b214c04490e16418e71ff733f8f228b45c",
    "reftest"
@@ -595697,6 +595793,10 @@
    "6b8ed24989fc78a10a70388faf22936094fd92fb",
    "testharness"
   ],
+  "css/css-values/calc-zero-percent-height.html": [
+   "ffb2ecd6dc9c1a1bf4b8f5fc23c851f00e01fd6d",
+   "reftest"
+  ],
   "css/css-values/ch-unit-001.html": [
    "83374e7bb291e45a44e3002635f967611aa1a5b7",
    "reftest"
@@ -596518,7 +596618,7 @@
    "testharness"
   ],
   "css/css-variables/vars-font-shorthand-001.html": [
-   "3c280547fb353a959bc6df95ad690445835ded98",
+   "e10aa87c4947c6d99ae7d331c7e42aa23e496d31",
    "reftest"
   ],
   "css/css-variables/wide-keyword-fallback-ref.html": [
@@ -597702,7 +597802,7 @@
    "reftest"
   ],
   "css/css-writing-modes/available-size-003.html": [
-   "c938c905ae0aa7462a593308d9652a910069bf50",
+   "70a61a9e34441b4a017241b364a6b1793ff2026b",
    "reftest"
   ],
   "css/css-writing-modes/available-size-004.html": [
@@ -597710,7 +597810,7 @@
    "reftest"
   ],
   "css/css-writing-modes/available-size-005.html": [
-   "ee324898ffea542da389b8d3a7e86dbffc8a6a0a",
+   "5eb832ff36e4bf8c48f6c220d80cdd236137ba45",
    "reftest"
   ],
   "css/css-writing-modes/available-size-006.html": [
@@ -597726,7 +597826,7 @@
    "reftest"
   ],
   "css/css-writing-modes/available-size-009.html": [
-   "5e26975999ea1c07716d6c989ea695c6fbd9c579",
+   "94f083af58497d37ce65648a15c53526da6352bf",
    "reftest"
   ],
   "css/css-writing-modes/available-size-010.html": [
@@ -597742,11 +597842,11 @@
    "reftest"
   ],
   "css/css-writing-modes/available-size-013.html": [
-   "1ffd6564ad0d81c1c4f1107616905145056bc68e",
+   "4cb6b237285a9da5060a5c28a02807675d3a6eeb",
    "reftest"
   ],
   "css/css-writing-modes/available-size-014.html": [
-   "e0e41fb6b1a8c38bd17bf90386cd90a17822a091",
+   "8e955cf59029050c62060b2597f3a3e3b94bec88",
    "reftest"
   ],
   "css/css-writing-modes/available-size-015.html": [
@@ -597754,7 +597854,7 @@
    "reftest"
   ],
   "css/css-writing-modes/available-size-016.html": [
-   "15038868b80534a55bfc77f7e3fc74a7552cc0cf",
+   "ba398032ba7554fcbf6a2037aafe4ad0820283da",
    "reftest"
   ],
   "css/css-writing-modes/available-size-017.html": [
@@ -618686,7 +618786,7 @@
    "support"
   ],
   "docs/reviewing-tests/index.md": [
-   "2f6ee822fcc480e2c1e519c6d236ac58082f9e2e",
+   "e313f84596da648a111efd5f817737e125829b6c",
    "support"
   ],
   "docs/reviewing-tests/reverting.md": [
@@ -618730,7 +618830,7 @@
    "support"
   ],
   "docs/test-suite-design.md": [
-   "adc6810f38f3fa5cea562e5c1f39c3da2e6c7aef",
+   "6a104e2f1d42fda1111124022dd7d94aaea3a598",
    "support"
   ],
   "docs/writing-tests/ahem.md": [
@@ -619178,7 +619278,7 @@
    "testharness"
   ],
   "dom/idlharness.window.js": [
-   "7d87aeaa337ed7709875428641f78107395d9317",
+   "24b56cf05ada3722c30a7a1427d1cbb324ec366a",
    "testharness"
   ],
   "dom/interface-objects.html": [
@@ -620649,6 +620749,10 @@
    "6c9963a8222b41e956d5d49d516f8e3c5811fc73",
    "support"
   ],
+  "domxpath/README.md": [
+   "918997b1646d73d71a79c302953ab9f0f8ed69cc",
+   "support"
+  ],
   "domxpath/document.tentative.html": [
    "b75c0f0d66dacb47a825ae2aa00bb63a19616433",
    "testharness"
@@ -620661,10 +620765,6 @@
    "c7c102945d070a4ea65cae0e30ea6ec64bb82c95",
    "testharness"
   ],
-  "domxpath/interfaces.tentative.html": [
-   "9036ad834a764798d2871a71a8b5734051949d8d",
-   "testharness"
-  ],
   "domxpath/xml_xpath_runner.html": [
    "42404562a3c95b3004c7b0b7402ea366faeb4d83",
    "testharness"
@@ -624009,14 +624109,6 @@
    "ad90864fa472cbaa3f95a3fbc912529f31fb3765",
    "testharness"
   ],
-  "feature-policy/experimental-features/intrinsicsize-with-unsized-media.tentative.https.sub.html": [
-   "9d4757f81ebe83544d428ff5a7161d6c69cdc795",
-   "testharness"
-  ],
-  "feature-policy/experimental-features/intrinsicsize-with-unsized-media.tentative.https.sub.html.headers": [
-   "db2dcbc1929b9e1264855e9b80f77dfbda5d4f38",
-   "support"
-  ],
   "feature-policy/experimental-features/layout-animations-disabled-tentative.html": [
    "0190eaa84f75e3097b95f70adde89296d47cc1f3",
    "testharness"
@@ -626234,7 +626326,7 @@
    "testharness"
   ],
   "fetch/sec-metadata/redirect/multiple-redirect-https-downgrade-upgrade.tentative.sub.html": [
-   "cede6712264e44ed885f8f6399ab74c2dd03a3f2",
+   "dc6d2d0ec1fd87cd8cd603ed47b03fd59d640f03",
    "testharness"
   ],
   "fetch/sec-metadata/redirect/multiple-redirect-same-site.tentative.https.sub.html": [
@@ -626242,11 +626334,11 @@
    "testharness"
   ],
   "fetch/sec-metadata/redirect/redirect-http-upgrade.tentative.sub.html": [
-   "4f173d9808ac550b443ecb9ed2a00c0b9a402b47",
+   "bfb7ea73e80762569acadbb0fd7d12ec044d8794",
    "testharness"
   ],
   "fetch/sec-metadata/redirect/redirect-https-downgrade.tentative.sub.html": [
-   "817843828c1b06b90ae3c293164a01c52961cd4e",
+   "8972bd0b6464a1504750a752497b0408f19ed2a8",
    "testharness"
   ],
   "fetch/sec-metadata/redirect/same-origin-redirect.tentative.https.sub.html": [
@@ -626310,7 +626402,7 @@
    "support"
   ],
   "fetch/sec-metadata/resources/redirectTestHelper.sub.js": [
-   "ad78702269dafd81d8c5e15cb7ed60419fd32c5c",
+   "c28af6476aac41a006ec4487d3c73c7d2b31334c",
    "support"
   ],
   "fetch/sec-metadata/resources/sharedWorker.js": [
@@ -636566,7 +636658,7 @@
    "testharness"
   ],
   "html/rendering/non-replaced-elements/form-controls/resets.html": [
-   "ae4da4540145dab0acb6db4455bc8a31522fed2d",
+   "052adca4c5b0b70819c5291503fecc1f39715df6",
    "testharness"
   ],
   "html/rendering/non-replaced-elements/form-controls/text-transform-ref.html": [
@@ -639581,14 +639673,6 @@
    "6281b2da553948a524fd39cef6d719cf5f42c7f8",
    "support"
   ],
-  "html/semantics/embedded-content/svg/intrinsicsize/intrinsicsize-svg-image-ref.html": [
-   "41ddd757eca501dcf7e8b059d021d730bab2c729",
-   "support"
-  ],
-  "html/semantics/embedded-content/svg/intrinsicsize/intrinsicsize-svg-image.tentative.html": [
-   "a0943169d0a5d960b97d4af9ccc629197e72a175",
-   "reftest"
-  ],
   "html/semantics/embedded-content/the-area-element/area-coords.html": [
    "9ec6f3e42732f62d2bf36936a214dc176e23bc07",
    "testharness"
@@ -641042,21 +641126,9 @@
    "reftest"
   ],
   "html/semantics/embedded-content/the-img-element/img.complete.html": [
-   "42113cdd2ff15255292f1ad705355f732a4f137c",
-   "testharness"
-  ],
-  "html/semantics/embedded-content/the-img-element/intrinsicsize/intrinsicsize-with-responsive-images.tentative.html": [
-   "739765c0d441aaf0d91c5f90ce544c5e1d81e14b",
+   "dcacf43db2ddf8c2a179d67326a18f78b03ff0a9",
    "testharness"
   ],
-  "html/semantics/embedded-content/the-img-element/intrinsicsize/intrinsicsize-without-unsized-media.tentative.https.sub.html": [
-   "4192e567fcc1921041e6a98d210df41199f701a6",
-   "testharness"
-  ],
-  "html/semantics/embedded-content/the-img-element/intrinsicsize/intrinsicsize-without-unsized-media.tentative.https.sub.html.headers": [
-   "4fbf3f5adddbcb8ec95fc0e2192f4da841e93b8c",
-   "support"
-  ],
   "html/semantics/embedded-content/the-img-element/invalid-src.html": [
    "37ea8ce754a3feaa3e305f10899632d231c92363",
    "testharness"
@@ -641245,14 +641317,6 @@
    "7819ee1c1891887aadec9bb600bcb18e6cc562e3",
    "testharness"
   ],
-  "html/semantics/embedded-content/the-video-element/intrinsicsize/intrinsicsize-without-unsized-media.tentative.https.sub.html": [
-   "d749d5576e6881ea900f7cd26e0ff6adad2610f3",
-   "testharness"
-  ],
-  "html/semantics/embedded-content/the-video-element/intrinsicsize/intrinsicsize-without-unsized-media.tentative.https.sub.html.headers": [
-   "4fbf3f5adddbcb8ec95fc0e2192f4da841e93b8c",
-   "support"
-  ],
   "html/semantics/embedded-content/the-video-element/video-tabindex.html": [
    "30448747892203f3d53ef4b9615a5a50bb62c62f",
    "testharness"
@@ -641317,36 +641381,92 @@
    "82798eaa84f533cdc675c653ef22fcb12b52137e",
    "testharness"
   ],
+  "html/semantics/forms/autofocus/autofocus-on-stable-document.html": [
+   "47e3e3fd0abdc93e8447c099314935f8cdc31c42",
+   "testharness"
+  ],
+  "html/semantics/forms/autofocus/first-reconnected.html": [
+   "99ee9198d1b0a39605ee7115ba71b1178e815943",
+   "testharness"
+  ],
   "html/semantics/forms/autofocus/first-when-later-but-before.html": [
-   "0267f46627f6db579ee639355d6e265e52bc305f",
+   "f361463401b555f4c90cc25f195dd8b6c7e03b0b",
    "testharness"
   ],
   "html/semantics/forms/autofocus/first-when-later.html": [
-   "9ced437f4a9456ff9076feb3965172ddb9d4a694",
+   "1d64b863a16e8a0745c4f207d5a92e80175ee34f",
    "testharness"
   ],
   "html/semantics/forms/autofocus/first.html": [
-   "de56cf74eda506c55460cc6da85923b5b7001381",
+   "02ebb79a3e9dff0f1b0211eb187b7a91f7de8c17",
+   "testharness"
+  ],
+  "html/semantics/forms/autofocus/focusable-area-in-top-document.html": [
+   "327040eeeeb7da9bf134cb7120b60c7d1e76d5c7",
    "testharness"
   ],
   "html/semantics/forms/autofocus/no-cross-origin-autofocus.html": [
    "c3974bd02a3655cef5513258e81f65e2f86e07d3",
    "testharness"
   ],
+  "html/semantics/forms/autofocus/no-sandboxed-automatic-features.html": [
+   "991373d3363a195bde7c7e4e9ad255026e173e47",
+   "testharness"
+  ],
   "html/semantics/forms/autofocus/not-on-first-task.html": [
    "50efc176935c710f43a42c31ecc0b7676e96b833",
    "testharness"
   ],
+  "html/semantics/forms/autofocus/queue-non-focusable.html": [
+   "e3b556035d35f6ea18d51cd3772651a22940d161",
+   "testharness"
+  ],
   "html/semantics/forms/autofocus/resources/child-autofocus.html": [
    "afd5601a523ff0a1d60d37b171b2098a38600ace",
    "support"
   ],
+  "html/semantics/forms/autofocus/resources/erase-first.css": [
+   "bbbcf799393fc047dae6d47836c3696868df8fb7",
+   "support"
+  ],
+  "html/semantics/forms/autofocus/resources/frame-with-autofocus-element.html": [
+   "985cba41494919525031081d236e4409aace453c",
+   "support"
+  ],
+  "html/semantics/forms/autofocus/resources/moving-autofocus-to-parent.html": [
+   "fc6c298a46e376cf45089f168cf841cab59ffd5c",
+   "support"
+  ],
   "html/semantics/forms/autofocus/resources/utils.js": [
-   "f3690a633ffb20a09430cf126eab9871fcf03c38",
+   "0eeb5a9f0adf1d09959227241cd71fe32ebb485c",
    "support"
   ],
+  "html/semantics/forms/autofocus/skip-another-top-level-browsing-context.html": [
+   "d392b903f075276a03189207e57d789608523de1",
+   "testharness"
+  ],
+  "html/semantics/forms/autofocus/skip-document-with-fragment.html": [
+   "a4301e13516634e9fc09d1b8084091a2697b1f24",
+   "testharness"
+  ],
+  "html/semantics/forms/autofocus/skip-non-focusable.html": [
+   "008371d8e163fbdec937e29435fe61dffd520cde",
+   "testharness"
+  ],
+  "html/semantics/forms/autofocus/skip-not-fully-active.html": [
+   "32008b3019e905488c35ea432de396a2641cb61a",
+   "testharness"
+  ],
+  "html/semantics/forms/autofocus/spin-by-blocking-style-sheet.html": [
+   "22a4c3573cccf909d3a5675db2aab97a4f366bc0",
+   "testharness"
+  ],
   "html/semantics/forms/autofocus/supported-elements.html": [
-   "cbd21010ffe41eb06d4c95c87ed6c4b87a2e7ab5",
+   "398577e7d51edf10ea2571ec4e220394208f6931",
+   "testharness"
+  ],
+  "html/semantics/forms/autofocus/update-the-rendering.html": [
+   "afaf0926f5b55e4f1925010c7262ed26a616d3be",
    "testharness"
   ],
   "html/semantics/forms/constraints/form-validation-checkValidity.html": [
@@ -641374,15 +641494,15 @@
    "testharness"
   ],
   "html/semantics/forms/constraints/form-validation-validity-rangeOverflow.html": [
-   "ca423ef9ed737f9f630db489ec2003393ec24b18",
+   "fedf2ea4e4f0aa5018db5bb24ec3bf0e15333992",
    "testharness"
   ],
   "html/semantics/forms/constraints/form-validation-validity-rangeUnderflow.html": [
-   "d6bf86060b1ae641f5c49c9cd381d2d68f683a35",
+   "8ac3aae1279c0f6df2203251aae26854ba551b57",
    "testharness"
   ],
   "html/semantics/forms/constraints/form-validation-validity-stepMismatch.html": [
-   "174ecaf33a21e972c1464579a0fc444c9556b112",
+   "6d8192bfbfeb6f0b1c472fe55eee58af6b4b9e1c",
    "testharness"
   ],
   "html/semantics/forms/constraints/form-validation-validity-tooLong.html": [
@@ -648618,7 +648738,7 @@
    "support"
   ],
   "interfaces/appmanifest.idl": [
-   "ddfe82dc34d31868ea044befa667a8c9987e5678",
+   "4a6425829f23da3cd1f78f74ff52a18635f7af7c",
    "support"
   ],
   "interfaces/audio-output.idl": [
@@ -648734,7 +648854,7 @@
    "support"
   ],
   "interfaces/dom.idl": [
-   "91157033c82335d4eb835907680210bb2141fdb4",
+   "03a0201b16fed569429c6cfc709063ed31681422",
    "support"
   ],
   "interfaces/element-timing.idl": [
@@ -648750,7 +648870,7 @@
    "support"
   ],
   "interfaces/entries-api.idl": [
-   "71e80c717b2becc9a005e471553910a26fd0a326",
+   "548aec13ab70eeedb9ba01ff96e0b3cb1d783510",
    "support"
   ],
   "interfaces/event-timing.idl": [
@@ -649074,7 +649194,7 @@
    "support"
   ],
   "interfaces/web-nfc.idl": [
-   "5107cf3b577ba2677226fd215e38cf40cc81d88a",
+   "8c77339ae865fbe2a67dd6c1247c797a5bab058d",
    "support"
   ],
   "interfaces/web-share.idl": [
@@ -650869,6 +650989,14 @@
    "585aebaf393d85187b644a97f6e7f28535fa9095",
    "reftest"
   ],
+  "mathml/relations/html5-tree/css-inline-style-dynamic.tentative-ref.html": [
+   "13f0139273690992825daa68fcc0666679590490",
+   "support"
+  ],
+  "mathml/relations/html5-tree/css-inline-style-dynamic.tentative.html": [
+   "ca3e679491951d9a573a0f754491cf549a565953",
+   "reftest"
+  ],
   "mathml/relations/html5-tree/css-inline-style-interface.tentative.html": [
    "b82f98e28b70cbfbadf7f585c9a2c8a2612ba05f",
    "testharness"
@@ -652558,13 +652686,17 @@
    "testharness"
   ],
   "mixed-content/generic/mixed-content-test-case.js": [
-   "eb9fc13f7c0fc5af0ade3df58a942fde5ae6d823",
+   "ee34c4973a9014acf78037d2e85c24aa994cc266",
    "support"
   ],
   "mixed-content/generic/sanity-checker.js": [
    "55a103adf0f29c615d40bc47943be1aec25c8f1e",
    "support"
   ],
+  "mixed-content/generic/test-case.sub.js": [
+   "d25986e5c26745976e13d2d683c3bece3ac2ccc0",
+   "support"
+  ],
   "mixed-content/generic/tools/__init__.py": [
    "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
    "support"
@@ -652574,7 +652706,7 @@
    "support"
   ],
   "mixed-content/generic/tools/generate.py": [
-   "9c911aa6c4102a411c1b134e33afeab69f600647",
+   "b80bc8df6bbebe969b88fd48d52abc7819ac9a3c",
    "support"
   ],
   "mixed-content/generic/tools/regenerate": [
@@ -653450,11 +653582,11 @@
    "testharness"
   ],
   "mixed-content/spec.src.json": [
-   "95dc2d318f54fcff89d5ad4fbd15656f32608288",
+   "e4844a8016b6f3242a1b8dc1110461cd39ff1e33",
    "support"
   ],
   "mixed-content/spec_json.js": [
-   "0868df220fb9fbe3eb5700f662c2321d708ea9ca",
+   "009a853077b5c37c6eeae9f87f0be75109c584fd",
    "support"
   ],
   "mixed-content/video-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html": [
@@ -662745,9 +662877,9 @@
    "895a89109c6d75d287b8508f0d1a10fa3189a671",
    "testharness"
   ],
-  "pointerevents/extension/pointerevent_coalesced_events_attributes-manual.html": [
-   "89149468a5d23d494f6b09d4142b43c8d1d2289c",
-   "manual"
+  "pointerevents/extension/pointerevent_coalesced_events_attributes.html": [
+   "fa68124c829f46d24c4a2cda789890d27f11fe73",
+   "testharness"
   ],
   "pointerevents/extension/pointerevent_constructor.html": [
    "6971dcecfdebf3a113ef4ef9c9e8bd7bdf88ea02",
@@ -662762,7 +662894,7 @@
    "manual"
   ],
   "pointerevents/extension/pointerevent_pointerrawupdate.html": [
-   "0d317010621d005b32631ad26a4f3b3ca08b181a",
+   "0f46583c9b5d83517a3028bfa735072ec306cccd",
    "testharness"
   ],
   "pointerevents/extension/pointerevent_pointerrawupdate_in_pointerlock-manual.html": [
@@ -662894,7 +663026,7 @@
    "manual"
   ],
   "pointerevents/pointerevent_pointercancel_touch.html": [
-   "a645033a247437604d6b1c4614079c9193c28e9d",
+   "b09ddd740a6d6775806731c8e069a4674e3b12e3",
    "testharness"
   ],
   "pointerevents/pointerevent_pointercapture_in_frame.html": [
@@ -662906,7 +663038,7 @@
    "testharness"
   ],
   "pointerevents/pointerevent_pointerleave_after_pointercancel_touch.html": [
-   "555e5feb010aa3277c454e8396d2b976f552dbb8",
+   "8425667a104a3c783285a868196cbb2b255b6f20",
    "testharness"
   ],
   "pointerevents/pointerevent_pointerleave_descendant_over.html": [
@@ -662938,7 +663070,7 @@
    "testharness"
   ],
   "pointerevents/pointerevent_pointerout_after_pointercancel_touch.html": [
-   "13e7ffaebc1a80ba7bef12d32088aca1c250cde2",
+   "782289384ab3cdb6257c142eb9ff9da674d0d8bf",
    "testharness"
   ],
   "pointerevents/pointerevent_pointerout_pen.html": [
@@ -662950,7 +663082,7 @@
    "testharness"
   ],
   "pointerevents/pointerevent_releasepointercapture_events_to_original_target.html": [
-   "12e31cdb234d1bbb5cc43b436415e44b12daaef2",
+   "6f6d30e16e1c5376a1a5b57c0c65bc683e075334",
    "testharness"
   ],
   "pointerevents/pointerevent_releasepointercapture_invalid_pointerid.html": [
@@ -662958,7 +663090,7 @@
    "testharness"
   ],
   "pointerevents/pointerevent_releasepointercapture_onpointercancel_touch.html": [
-   "493236150dd32d0c6713b5b2dff123d1eefd5f7b",
+   "c54ee2a9d4ebb242b33f89c2b436753dfff6dbbc",
    "testharness"
   ],
   "pointerevents/pointerevent_releasepointercapture_onpointerup_mouse.html": [
@@ -662978,7 +663110,7 @@
    "testharness"
   ],
   "pointerevents/pointerevent_sequence_at_implicit_release_on_click.html": [
-   "0c6e2c532f9cc5ae410f6bd399340c55e937859d",
+   "4b424f27643a95f4170da5d7fb794ca3dbef1ce4",
    "testharness"
   ],
   "pointerevents/pointerevent_sequence_at_implicit_release_on_drag.html": [
@@ -662990,7 +663122,7 @@
    "testharness"
   ],
   "pointerevents/pointerevent_setpointercapture_inactive_button_mouse.html": [
-   "7d0b00d47bc276dbba5ae3076bfbed0a912ea327",
+   "fa9a5fb3c5b8ae7df867159aab8fc3ad7a6c77e2",
    "testharness"
   ],
   "pointerevents/pointerevent_setpointercapture_invalid_pointerid.html": [
@@ -663018,11 +663150,11 @@
    "support"
   ],
   "pointerevents/pointerevent_suppress_compat_events_on_click.html": [
-   "341a82d97a8e0ff4ffbe2d87b817fce807dd39b6",
+   "2f99e7a976ac8006cff25b9cde1ee1e29b6a14d1",
    "testharness"
   ],
   "pointerevents/pointerevent_suppress_compat_events_on_drag_mouse.html": [
-   "6ed75ab4cbcda3c673b3328a826019bdade4db5d",
+   "6ed19c24678aa03c82633af7aa146fba80232c0b",
    "testharness"
   ],
   "pointerevents/pointerevent_touch-action-auto-css_touch.html": [
@@ -663050,7 +663182,7 @@
    "testharness"
   ],
   "pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-y_touch.html": [
-   "704b4188979f8d39e6812b5b4a0e8900d62d7e6f",
+   "99677313de57238767c32302a6d81d708a459e0e",
    "testharness"
   ],
   "pointerevents/pointerevent_touch-action-inherit_highest-parent-none_touch.html": [
@@ -664225,8700 +664357,9344 @@
    "93b6037ca632a678f8c3f1e071392e8e3bf1540c",
    "testharness"
   ],
-  "referrer-policy/generic/iframe-src-change.html": [
-   "15202a76a1ea3b7ad8deb35cdb33826414d7a95b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html": [
+   "3d09f39410b25113d0aa00e0782e688e086f2705",
    "testharness"
   ],
-  "referrer-policy/generic/inheritance/iframe-inheritance-data.html": [
-   "06c3c9b0c4bcf4297f903d422110c2de420679e3",
-   "testharness"
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/generic/inheritance/iframe-inheritance-srcdoc-child.html": [
-   "08acb405c211e4cf84ae6565a84120ad45b0271b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html": [
+   "9c7a9245ae8a3ba9daa3a13fb4105a54641fd201",
    "testharness"
   ],
-  "referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html": [
-   "34ea0045b4871d97acc9b9359e7920c7e04d8c59",
-   "testharness"
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/generic/link-rel-prefetch.html": [
-   "914ddfc4b225d26c675c61ecf623fdebb10e4524",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html": [
+   "4be57de275585696151bb0c11f3796a3c1cbaa19",
    "testharness"
   ],
-  "referrer-policy/generic/multiple-headers-and-values.html": [
-   "d4826ce8a7ae2b40898a598c36523d9520c54b4c",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html": [
+   "6f4cebe3ee718791beeea6474b9911ce27c9b3f4",
    "testharness"
   ],
-  "referrer-policy/generic/multiple-headers-and-values.html.headers": [
-   "d1acc2f1d3cbce700865d96937e612c56e075166",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
    "support"
   ],
-  "referrer-policy/generic/multiple-headers-combined.html": [
-   "47b59f556614119ee1dfba56e6673a652a725868",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html": [
+   "2dc8bbae43bb268a6e844c26bfc4d3e8f78ea5d9",
    "testharness"
   ],
-  "referrer-policy/generic/multiple-headers-combined.html.headers": [
-   "fc30a2a18627cf0cb485836f8d44f45beca510f2",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
    "support"
   ],
-  "referrer-policy/generic/multiple-headers-one-invalid.html": [
-   "9bd661fe6a247809f1e8b7ee5ccfdcadad0f4edd",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html": [
+   "fca7e959656b0ba22cf00f25e25a54386125108d",
    "testharness"
   ],
-  "referrer-policy/generic/multiple-headers-one-invalid.html.headers": [
-   "075219380414598f4535faa973fe69468fc7d37e",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
    "support"
   ],
-  "referrer-policy/generic/multiple-headers-one-unknown-token.html": [
-   "7c28a5ada5273d94ac07ca2ec182c06047b9a560",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html": [
+   "a7abfde5e55086741b52f2446bc76ad560fdd407",
    "testharness"
   ],
-  "referrer-policy/generic/multiple-headers-one-unknown-token.html.headers": [
-   "46feffd705fe0e559b6f80a4a6b7f7bc46b26121",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
    "support"
   ],
-  "referrer-policy/generic/multiple-headers.html": [
-   "7f0364f1853f65cb1020af53bbeefcd6f44b0011",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html": [
+   "414983622a16963e823162dc10d40157daadf5e4",
    "testharness"
   ],
-  "referrer-policy/generic/multiple-headers.html.headers": [
-   "dd1dd853f2030bac5c036f693a7cf0eca6daba1a",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
    "support"
   ],
-  "referrer-policy/generic/referrer-policy-test-case.sub.js": [
-   "972ce8de06600d56a94acb503b7e0d5bae3ad3eb",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html": [
+   "4e534a9c7535e31eb8972b077f59511bd66ff041",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
    "support"
   ],
-  "referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html": [
-   "0e8e5e1306f5f51c17d8a89c92bb86573c3e275e",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html": [
+   "af8dba9f66f9f77c011b41086ad451c10da6b3a3",
    "testharness"
   ],
-  "referrer-policy/generic/sanity-checker.js": [
-   "e296ce93b965b788ea79f2f2b6cff45d5dce55f0",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
    "support"
   ],
-  "referrer-policy/generic/subresource-test/area-navigate.html": [
-   "ad49c0c2efd7ef18070a73caafd9223e1ec3b39d",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html": [
+   "131dc9a4c0b26d511c221dc661ccb0adb6a91549",
    "testharness"
   ],
-  "referrer-policy/generic/subresource-test/attr-referrer-invalid-value.html": [
-   "bfdf1166ce7876c478b4cfcf9dab439d04a7e437",
-   "testharness"
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/generic/subresource-test/fetch-messaging.html": [
-   "2d835274c132591a8edc574ad747e7d103de0659",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html": [
+   "48eee6b1da777d15b1e85e9d143efc043a95bde7",
    "testharness"
   ],
-  "referrer-policy/generic/subresource-test/iframe-messaging.html": [
-   "2f97ce4c62a8dc96c886e17b9113ee9b7c021174",
-   "testharness"
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/generic/subresource-test/image-decoding.html": [
-   "97abb153f1fca19eb53c280117120299374b1b6c",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html": [
+   "724c507b4810500e506fb11ab59d2b582be775b0",
    "testharness"
   ],
-  "referrer-policy/generic/subresource-test/link-navigate.html": [
-   "e96fd22539829ef2f71053517941eb3a8178d167",
-   "testharness"
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
+   "support"
   ],
-  "referrer-policy/generic/subresource-test/script-messaging.html": [
-   "44c938fa6e1c34b3761ac6a797d2e87a319fc08b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html": [
+   "6f86a5bd30480cd6a00e029b7809d8ebd9c3dcab",
    "testharness"
   ],
-  "referrer-policy/generic/subresource-test/worker-messaging.html": [
-   "0612e9965983c4ee696e63be71dcdc31981aa31a",
-   "testharness"
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
+   "support"
   ],
-  "referrer-policy/generic/subresource-test/xhr-messaging.html": [
-   "8afbf1db237130d6c8258b755ceac5258f6500fa",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html": [
+   "4933e9c413ea3c85233f6e3f28b460bc41f632cd",
    "testharness"
   ],
-  "referrer-policy/generic/tools/__init__.py": [
-   "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/generic/tools/clean.py": [
-   "715e1d6ae4b53461a99b3789a5200e4cb6456f4c",
-   "support"
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html": [
+   "cf55249cd7d04c9bc447b4db830893101a85aee5",
+   "testharness"
   ],
-  "referrer-policy/generic/tools/generate.py": [
-   "ba1e963787bef98bdd0a3eb2016296995f631f97",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/generic/tools/regenerate": [
-   "e6bd63519b331b3a921755445f6895e39f7864f5",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html": [
+   "c5233ad7fda54319feee0c8a8a0f57d19dae9f75",
+   "testharness"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/generic/unsupported-csp-referrer-directive.html": [
-   "0a29f38c0288c34c23eea14a6053d68d6b19582e",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html": [
+   "53098fb5eefd632bb94877133a88c44e412d2204",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "ea712646bb16025d8bf0e40aa98104a490a7065e",
-   "testharness"
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "cfc379c0534522e175ff0326f9aafe72d4e49d2e",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html": [
+   "4e8d4a9c9c32519a1586c0a460d42629b979bb6a",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "0d592b59d40b62543de7b7d2d25d55817f0bdc17",
-   "testharness"
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "8d108c74608fad1c9765c5d6284bad72e54275b5",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html": [
+   "e03ea85dfb98a8496ff7e312fe8ade8b88fc3df8",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "8a3731927e0f015697c5b56248a63c7345d2d195",
-   "testharness"
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "463728a4ecd9cd592090b5be6648bf2d13251d54",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html": [
+   "2e7836a1b2f8ec4b7dfeb911484b667813417a64",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "d5275be0409ea79c947503e825ccf11fe1912295",
-   "testharness"
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "21ea496ca4911832d4fd62afdde6470fb5e90b9e",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html": [
+   "4e91d52fd052de8c91adef8d2c7ed4921362c80c",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "c54ac62bfe9fccdb76c7897bf2b3d6d85207e322",
-   "testharness"
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "cdcc134dedfdc84dce7975df662466bc56115032",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html": [
+   "1943c0909bf427aa93c7a242e2f17e10d0a79810",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "43435ff17b2900b564d7cae86b35a47752eb279e",
-   "testharness"
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "61b962276bb7fca9cdb6f247cbf6e691210015c3",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html": [
+   "489c3e799b7214702bb7ad4ff9751cb56af53f60",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "0ac4282fb4175860d7beb8256437bc9bcd32b4ad",
-   "testharness"
+  "referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "ad75a53979dcf904fdbf20858080192491feeb55",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
+   "65eba0840206ee229ec99cd31fae4bd4ee7865c8",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "0cfaedb10bfc4488d1c3824ede8de6ecd8bd81c4",
-   "testharness"
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "3ef49b93f0f6fb0101e1ecb94d1cfc42a3b15986",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
+   "37f4e008b3500b675b9ca99627ab93702d3b7186",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "a060a3bcfe270df9b3da7b9cb2c50ea9b90aaf04",
-   "testharness"
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "deb4132ab084ba1f8f0db78ca192c189de3bf7f9",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
+   "369c8a5c0b2ec686b272f11e474fb91005e2f925",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "793166af730eab51f8c8fe58f33352c7495c5312",
-   "testharness"
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "1737e72548c1378be77074d8d4cfc4307bdeadba",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
+   "d2a864a064f3892252cf040b2200a4af786c136e",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "57fb4a946c1897e61efd7160ef7b64a58296bdae",
-   "testharness"
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "c64034d2bbd16777ac5d20b18ae662ab59d3d984",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
+   "d6459820a28547676f8caf592d0c48d00d1a8614",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "387f84c09bae3a8644ef28b0cb3db7734047b7c3",
-   "testharness"
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "4d0c946bd7a58083be4fe854cfdcb1e7e6455705",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
+   "ecbf180b4c201fb7a3b137193105ffceed71a3f1",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "9c769ba10d952c874289c5a7b0dce4757f201a1e",
-   "testharness"
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "2b1ee01973e73e5ffb1ccae3229e22d98b9f673e",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
+   "9a4124ccb67f61c9b9de5aba7a1f4203a2a3500b",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "42665670f5bb6de4d020e40aab5dea56940d332c",
-   "testharness"
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "fa0accb2c068094a4d718f9d21b69b145072c770",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
+   "40104428e2e5afb683e452fad6f8aa697021e42d",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "59d852294b20500d5facf71ca8f112106a0539b9",
-   "testharness"
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "e1b79bca8050de32a3a38ef93a89cbe42b9d6206",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
+   "b885d9457bcfd3036535af20d269f3240dd527ed",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "f0d321a52cf5a0c3c12589701b0c1bf55db97e48",
-   "testharness"
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "ceeaba32d598ec2d4ac74c2e59268b9fdf6d59e8",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
+   "8cac3b45fb5e7cc927469082fde21efa41bf6e1f",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "59322a856e01b891454f4b97b182e9cd217766b8",
-   "testharness"
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "ea8dcab7c7d3cbcda26f73eba6059a28a1085251",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
+   "500f3f39a959a81702b950c00f2e4b61081f18b9",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "5aa80479004486ae33c3b9cc0421db7f18608494",
-   "testharness"
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "df88f442fab55c2c019ea63aa679328370cb9fd2",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
+   "0c6e5e90a6c70fecd0189b86c520365e6db6cd23",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "8ffbd3a852caff1dbefbd463a45d5d47dbc77fab",
-   "testharness"
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "455efc4ae70503796438569eeb318d2ff1c1ee95",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.keep-origin.http.html": [
+   "79b4f65accf1aa9124aa54447cf42425c4b1cb9c",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "89da6893a20e9b5957c0ee09b15a8d6172362cc6",
-   "testharness"
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.keep-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "6b29a191efeddb78168ad7a1cbf4d1c5ceff38de",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.no-redirect.http.html": [
+   "df734f1e60cfac06bdbb0b490f25d56adfc93801",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "eedf34f796da2a92801d91c3d4b2504a5f42983a",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.no-redirect.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
+   "support"
+  ],
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.swap-origin.http.html": [
+   "70fd1c97d13a3105917bc1ffb60bdff55ba4df97",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.swap-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "8b77fb7524703bad5ad9c54a4264e38b82bd7d67",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.keep-origin.http.html": [
+   "82b9c0f33105ad283e75d34899f3bbf2737600c3",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.keep-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "3e921ee20512d1adecf6aa9abf5dc05acb312297",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.no-redirect.http.html": [
+   "001ad080c579d1a91e102e080d96dc660a80bb03",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.no-redirect.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "c7821aae3f693ba5f631cde37f378e413687dcf0",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.swap-origin.http.html": [
+   "4bf38ace3e16a310f231d689a7f8554c0e8b0865",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.swap-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "bae8956bf7dd3441d31da9c9e8520f61ede8639f",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.keep-origin.http.html": [
+   "2e72613575a820e792e5143859d2c434cca9792b",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.keep-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "c418c5a27142173dfd416a795ff5e19fa7292e7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.no-redirect.http.html": [
+   "597c2f6c77872a724be5eaa24e28e34f610df3be",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.no-redirect.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "d8c7a5467c56bef782dbe1b3efaf68a80d7f6bc3",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.swap-origin.http.html": [
+   "038d63c730ed6188cba6531db8c331d15c134ae1",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.swap-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "437a2c703c09847bf2836d21513ed9f3297edac8",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.keep-origin.http.html": [
+   "f4c5190091e736026b25bb574af3f35b4b5a85c7",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.keep-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "5887e73ae7a2abe0bb819d8dc9ec1562ab07960b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.no-redirect.http.html": [
+   "c6a4a9508dee37f436a44f2c03d7fef2e87d1901",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.no-redirect.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "e320e6191b6671a574000c5f7555a570c2b78359",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.swap-origin.http.html": [
+   "9880f1600576922341b32b182e3aa736b484bbfc",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.swap-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "fc100af00818b1e598fa8760713e554ca7fd995d",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html": [
+   "656cf35626b84abac42f2ea9d1f7b3595e9b7f21",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "c9810465b2cdec20f641eccf58bb2704585c8d96",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html": [
+   "9639c199a568ef5928c0d5911a5e59ee9c2dc1e1",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "71c95f870ffa9183d14e2e60b245619ced2f7171",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html": [
+   "5dd7ddacfc1ee6e3bc22f9fda85373ae0087980d",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "9fe5ef8a619b38e36e83266e06cc159acab33d94",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html": [
+   "26bf31303222315a69d103f9dfdfbbb64db6d9dd",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "0901c1bc1f647ad666ba9803c18a6c9641a4d618",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html": [
+   "f9fd0b0b036aba45fa2eef60f15f1a3a5badd0dd",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "3f3bcb557ef2681ad0b0113fad98b19d735d61bc",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html": [
+   "818b0816c242a44d12bf139526a12efabfdf94ec",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "7a78d49b6411187729cb7b7d9a6a9e4780d3a7ae",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.keep-origin.http.html": [
+   "166d53adff383437c3dbf853a9e78beb627a39d6",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.keep-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "51adeac1f1577e02441b559018b1316ac4c56153",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.no-redirect.http.html": [
+   "d91a2e81636353a4d00afd00740aefb846f3c203",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.no-redirect.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "97c8b34e5fb875615f9d75326fd67d68c5df00fa",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.swap-origin.http.html": [
+   "ba587f84dbf374e8d05df6c88baab8b4eb69d3cb",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.swap-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "67241ce46163e5db9ecc697db16e9ad51e40ca5e",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-https.swap-origin.http.html": [
+   "f386befc6eb44c98a6a33a5c6fbc1b4afd80ab41",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-https.swap-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "f60094da322b33a0ab1c6c2f880191484046b6cc",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
+   "27d8de6246d4a96041e6a5450b3bff421a177915",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "183e4dd4367108481fcd1c101ca89bc1c9f41f6c",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
+   "b914efdc87c267ce47d99ab792895d3a18fec257",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "5a3b4486d82730155537ea030dcf34734c628392",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
+   "bfd6f1c3f47c7e6bfe8bd73133b469ee13989dc8",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "6144b6e19ba4ebadce84ed1b36939c8c163e51fc",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
+   "0e9935af62aababb7cb39c128d83f03c268afc65",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "4fe4fe8bc0ddc96bacb0dc6bfe0f7ea30e6cc6b4",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
+   "5d7e1268e1910350811d5f009c9c052e056e9236",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "0ed931f885d3e864ccbec65d8e4eecd9195edb7c",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
+   "11a717d4725b53505be8e706b03b38d0bd15776d",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "9be57e4a592571297a88ab07e0e3e22cc0622f84",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
+   "8b36d15a3fd873b42151bbf3bf5472e2cc3a1356",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "2df7c747290f13a72ae2b0db24f4d4879b925bab",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
+   "f1158b0cf48f134892febd29b93aecad385d4750",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "75d4b9fbe19a83a6ebd04b93ff4e6ca2c8cd1478",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
+   "da39661bcbfb25621e8c0c4f770e8d65b8f42c48",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "2a9392df1d64b1cc2efe4987e3ffd7fc777bde1b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
+   "d9fe8e197702b0a1ad5484933838b56cdf7fd6f4",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "028ee939474deafeca109aaa87caaaa25bf4b9a1",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
+   "26154b93ecfa9922524d7190a8853f0b20326d12",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "66e42d84e1bc419dbd98243943a45bdaa9d546b8",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
+   "eea93a2d5c23bce2774f0538b9698baec8406551",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "0fc1d169c9a22a0f2d585dccd36536463ae34730",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html": [
+   "129d0344bd83ccd2afe2e8bb3ed540fac38d039d",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "7e988ffbc8e84ddf4de79846c1138e47920d62ec",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html": [
+   "df2cec8fc86f29df3dc7110129013be0428e36e8",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "335fde0034b4a44d8be0f98f86951801a8335f34",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html": [
+   "91e9d03c5459d4af68e46217de66ad7cb0a5a081",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "3ab4e9b33a7eb3afbc1c90bc9dc72e367afe0fb6",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html": [
+   "5820a30aa69553775e0311fefc74e8a622cfe5b2",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "c8946d88a006db7e3359791bde36ba3eadb36d22",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html": [
+   "008db741e3b16a8570e6861cb6382a292c7455c6",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "e79e8a057422b9264d119aa22563df314e65f8b9",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html": [
+   "6512f2a1ec32c3f0c911175a2298eb5e39bc1fc0",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "cc5ea2700e16603f28a3fb85ed150b9e48807037",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html": [
+   "773b18c0a5a71b40ac58ccd183b737afb61e1a7b",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "759625f622c159d0b5d811c51deac8b6e54d493e",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html": [
+   "073133aaa2b8b741ca19142a2247c042f7643e20",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "34c39041f990e91f539d4f14dac5811f4f099507",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html": [
+   "121c4e97b6753551032b346dc984ac99ee605911",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "9301f0b2719c1c025b50dee3e17f4d616944a54c",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html": [
+   "c5869dc778cc0903a60195c8e02bd9541fe25e42",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "7b9a33f47e4ddf38267b257bbccf70858adc623e",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html": [
+   "85fc13eab5296800281d05b41f3353e1612b9563",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html": [
-   "3303e355a48ce49414ee404db4c3fb325753ed70",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html": [
+   "bd74c1f3600096aebbe9d3d843c8fc67c6a8036d",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "932ac4e18f99ce3025e6131c83abb0c2b5ed08cd",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html": [
+   "8816e074d98cca5071a8bb069dc8d7cab4352c3c",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "32dac4bf4face0907dfade7a7611bf1241fa0f18",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html": [
+   "b24b847bd607fa862b9645c7c9e1b49ee8d691e7",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "88a6f0b3283fcd5b79f56dcb0b3a669d69de4bf5",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html": [
+   "7e30815d9b61445ae992c45078433f11a6809a75",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "0caca74b53db5af13c73ede1ee6eef0beb50179d",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html": [
+   "b44447b143edffbda8b3cf49fe4b832af0f536d3",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html": [
-   "f6215762acb1a2b3e3f433bb69dbf124187492e7",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html": [
+   "2fb45874a1a2235ed0520711a721c0063705a576",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "35123332a8a172ee519ccc84ee1bcd0edec0edbf",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html": [
+   "8a075efa0879c8bc37c960eb43d891e4c7d5f52d",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html": [
-   "757b06bc6ac19648da21567e9798bf97702115fe",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html": [
+   "a2108d0858d26ffe3dc3a6d1930c4a66a69a0ded",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "3044b007cd99a4e6b7d826c8cd8de93714c6e6a6",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html": [
+   "ba8e55344ab70ca0f34d169e71d217c1ecc656e5",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "2f61fa770d7a0412aa27e42e37c0bd107fe19f77",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html": [
+   "b1aec995339bada03e0480ccf9ca768d07a21ba7",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "fbbb9efd93314b01713230fa4866eb78f7b05141",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html": [
+   "b8676f6fcb226c9e4312a5d18873a19015442b7b",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "93479418ab5901ffe893b8c15d543834dc636e61",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html": [
+   "c4d1fec0f7697de0fdf2d8f30192de37e80fb731",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "8a6ba540eeace78cc19fe0d31270ccb8bae4333d",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html": [
+   "48ae72274dcba10314dc25734cc193e755df78fc",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "de595abdedafa82b1c7b89acb49c112050209dc8",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.keep-origin.http.html": [
+   "3b5c6087ca7d23daef1897071a7c8f82726049de",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.no-redirect.http.html": [
+   "777b6de1ef037f340cebd821a4b120bd0cac6f06",
+   "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "07a1ddc3a026b285d641b47cdbb7947b8885aa78",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.swap-origin.http.html": [
+   "ddb55bb3adf9d8090f6d5131048799735a504e9d",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.keep-origin.http.html": [
+   "c663c20976705c83a62dbea6ecc35274a004132a",
+   "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "47c96588dbffdfdd242fc4df55e4e54213df66a1",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.no-redirect.http.html": [
+   "5d7b3c942502df94cb354c8e9f2b28907ef79c18",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.swap-origin.http.html": [
+   "0eb10a224b464bfef1a8e5c698a47060515de9ba",
+   "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "e047b17d41185bc9da7f6cd5545dc5cbe3c36688",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.keep-origin.http.html": [
+   "e413286edeb151f4934992f9c7f31e64a977915a",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.no-redirect.http.html": [
+   "5e2e08f3a755c7c55418316580bdb7e58710b187",
+   "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "404e18bd65477000532feb28c32efdfb6e6c22b8",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.swap-origin.http.html": [
+   "433bae3c5bbcf5c4382445a5ab9f3c8404d00074",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.keep-origin.http.html": [
+   "762b46f345f1b6f523d897089782c5be8b13832d",
+   "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "246db4570357c1fe090483b95a748c7b22a4db64",
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.no-redirect.http.html": [
+   "27e5f716b3a0ba36d2b3e7325887f76c7c8668ef",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
+  "referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.swap-origin.http.html": [
+   "687598c5f559f713c40c6ca42c8c72ee03f0b46d",
+   "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "0a2a0f026c63a95e8e6c26623ad52800cb210ffe",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html": [
+   "0b035d26e380f2c60df65b3c26b1b741d725d432",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "b35d8f7f4f1d7d434080dae8d3df7f1d2990d6db",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html": [
+   "dec56bc9a0d305a1dbabc1d6214a9c88f04059df",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "aee79e7279e15a70845009cc802bcef41d36f7dd",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html": [
+   "64cd66eac68212a1f80f4dfeaf473b88fb0f703e",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "e1ae930f78b59ff18765f3c29a19205bfea9b4dd",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html": [
+   "15e60b67956df7eaada3e0f6b0f1e43e393ebe6f",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "5e871b806598baf512faf339ce95ecb7b361a420",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html": [
+   "c0d07f85854480d6d5995522c235aee2502f9390",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "c606d407a3dbff162c084ac11ca1ff9bceffded5",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html": [
+   "e53ac5124410af783eb8fa465be4900dacd5b3a8",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "bb9ccab8126606353374ff9bb0543e828d19841c",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html": [
+   "cd75aa203ebe6b4218a30730ed2e3134ceb4a701",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "4544ade5134d735786244e15e0373171663bf1a3",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html": [
+   "9be0bf3fadd50ea056ecfbc88a643f1419e8a314",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
    "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "14d891c6ca0a6fafb699ab3f41111d1327507838",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html": [
+   "4c3708d687f539201a97dc3d4e32a21e2a7ddf9c",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "7205b5b5e20afd7529acfe3973b755bd9f9e34f5",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "2bd7f7f9f96c7af26e1b7ac7e237f31e863a2feb",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html": [
+   "bf27bb461610a08ec4f04878845a2cac58fa07ff",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "6c941b98affe9791cef3d5a87166e3c0bf36c571",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "78a12c0faf78d315935f1d2c049d47e20d9bf534",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html": [
+   "5a9c1cdf3869d078086d19bb824ed337a74a09ff",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "8cb3b1da63c48298276ff3ec6749fc2df98e844e",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "98b574b0334f1ad7d2d123182f9a5c4c1279db06",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html": [
+   "c424f516c3ba0bc38d0005b94fdddd1704cd6f03",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "f6755e99add4f8a615fa20645d01de2511c82563",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "9ee1de48295f458eba00147cb56171c95e16c428",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html": [
+   "67f97ec87be8d6c2ad861b8d43aba3d747dc6a8a",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "1f0b254a2a1b236b391c1f8dcaf7a95c9e9f246c",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "85b47db7c49082f36a4baec85a5d58db52cbad0a",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html": [
+   "54429d45e45fccfbec52bfd7fe8a1d6b21f73e64",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "e2b6315eed71a4ce1b0c46a125e306bc3839ca86",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "8cd18a658d0b849b47878d96ca987e6e80104481",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html": [
+   "b756a252c4475ab23e1ec1cd79f0e8cc5133e7ff",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "db8b65c9070d18eece1e03102c704d19e6e9ebe1",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "b37fab1c7d1e4cda18d7527624110ab309d54975",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html": [
+   "41916d9334f8cfa97365d9462679502ba89b056f",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "a8967e2f0077d43ff01615404f7e30a32890d12c",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "0f512823e8e0aff1dc30b0a5502209c7f345480a",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html": [
+   "b1601e51a5fc9545d7486b93212161aa6e954cde",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "1a7931b10169f9716cbc23a3de83dec208227151",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "7c80c012b343737c9b7a21baa2a03a745f189812",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html": [
+   "f70ca471457bf8c9bb1d2459741119b5f7c16a97",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "221dfb63ef9542615e7f36c64f009386332628df",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "6373a785fc27360812350738eba09cc2ff1584e5",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html": [
+   "b4f872261826611a2a55888b82995550f0356a59",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "20f91bbeb1d06a4aba31ba8c1e505b4d60659402",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "c20b8e0eff6abed5af6ad34d2493a4abb0f013eb",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html": [
+   "078d1f15e0ced4a45d2ae11fde26455937dfe3f8",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "44b8145030a8405d45d1b6f8ee2289d6b6b9d997",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "dde31a65bfcb1601ad5d90fbffd44c19d9b0ce6a",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html": [
+   "da81f5061c6f13ef023564b44a9d3ac65aa42049",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "98d1e9812043b069927a4cce24602ed353f2cd1f",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "e6f1a3e27c8c8e3532f6ecb42c70845ec4a1cf52",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html": [
+   "aa7f4bda7edcbe926e9c740ab32c6a5559266d4c",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "4737eb59404d345353e3902e669cbb57115f76f7",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "41018d5e2c0495c6e37dafa63810837fafe43f41",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html": [
+   "9ee83c852c9d5a70dac096c4ae62ab8f3809d8d0",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "adc9f952d66a29c6c0f96f7e304e526eb1bc5fb4",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "2210516aecae7941279fa49f01b78630ecc383b1",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html": [
+   "cb6e6ff16bdfa45a65d67552d7ab6652355af4d0",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "43fab7d570182abd7b704868cec9a94a3db92939",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "6a5f3c4fcc596b42e5526074503660605fd05b93",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html": [
+   "282c1793384fc6f999aa8327fee9b3c44d045ffa",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "1f280d02fb431008f260f9de8d3ec7f72c3e3063",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "603daa98f176a1f22da1eeb30e5ca3d5a719c7df",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html": [
+   "8cf052f45be70dba406f76373c35df4a302e21b8",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "6ce64e62d249e7560e0f4e415a541dbaafee04ef",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "93075883216d0535c58d56dc2a3f6e22590cdbdf",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html": [
+   "15fd0d762a1da46353d30551489d676b3148715c",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "ef700be75056d90db09ec3a11116d7f5ac443100",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "070e6a8817de43ed65f46342397c32ccfc940bc4",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html": [
+   "6c7249285246b4b67477fa25926b374424a13d9c",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "7784873f7f3f7d5010b5fb863a299d1bbec631c1",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "917c0b88847819501699fbe6ad08a051733f3376",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html": [
+   "8b2487bc3c11c72c7c8a5a5358226d1f64e0d302",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "a00848a63ec75e51160aefc01705414596466ecb",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "f75b72157f4dbe42d31ae3cc3a31971c7965b291",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html": [
+   "97857ee903a21dd770095b2f6b5b0752e8c8e987",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html": [
-   "f6367edbb2295c0a9a054ac06cc6a720a9ec04e9",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "c603a42b7c599186476d79d8d37869ef13a35d40",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html": [
+   "a5d151a9eb49dcaa41fb25d0a90f77f6487b6424",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "6d303558e7ab66aa5f4a1d7124514f20815b8518",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "4436fc516bca5dea59515170474d683d5f51ed00",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html": [
+   "b07400aa18a097d6a0399d518d0fb560ef56b165",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "20047defd66fbca528fe66b0ad022aa131e40c0f",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html": [
-   "966abff838de5cf46e77fa9b4aba9f8c900e2cf8",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html": [
+   "dd3bea4a79bfe8b5367775d1f0f9f9c200414796",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "c6ee143fc889c80d59bc995374de5571f4f35e60",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html": [
-   "7e239d69affd311f8f89ba10f516627382b44c9d",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html": [
+   "485b6592c14fde22d268bbdfe32944541346f6d9",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "31c3b79a581af0ab640f99b23c07c30bf23f636e",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "6eed03783b28a6af643a4ee15e0e84d4d0308036",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html": [
+   "861b00b2d9159a79bcff286c15182dc0caa73bd1",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "61a5e51e637989de96a29ca6e3d4766747e9eca9",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "ebb93af5050bc08a0d6eede2fb8b83f3e9d27977",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html": [
+   "480f7f1a970baab4e20e27bd2ce57ede2a9ed424",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "7699f0f96b68014ef64861c20b42580543f56c5a",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "12f4286f8d8fd23ad13774f99658556aab2e3525",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html": [
+   "7df7be8a5301243473af666a1764c86f39510423",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "e44a4fc096e5d6a5e42330ceb4ce0f5bca850321",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "6a338aa72ce3c11f1cb54fb20ec67ec3b0643a87",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html": [
+   "f40eaddf0f9e223bd1e7ca17b27cada2275208ff",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "5c81707fb553feade3e1e8d1be5d31927893c960",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "90c65ae6e87e80cf4c140bafa98d68168f7cbae8",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html": [
+   "aec116e896bb58e3fcd72fe01f59497fe31af88b",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "f4bdee5ce8681848e3add2ec9836f62991c93279",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "5e12002f256403ce8c705288c4f355b46a1a6965",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html": [
+   "89a479c00e6f2f05579c313c83cb83d0085c4206",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "134f342965ed71e8dbcc1d25ae265561d9302e85",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "ee71a0d6f04d7ba4669293235131da30401db251",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html": [
+   "2414af93892b894d4290ce15b41191fa0b5b4549",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "efe2c0d2f95566129454401f2830040f21efdb7a",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "83ca90175514b516532cc3b609fdc89c6a577b78",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html": [
+   "0dda649cd20a94f0bc673290ef9aef04e9e6b547",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "c902ffc410fffc0653d88289413e77834239f26b",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "7bfc76565764d7e991e8d44929c3f5319b060501",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html": [
+   "73a715bbcc4316ef982bf4c0c80d20f49fb4a625",
    "testharness"
   ],
-  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "c85180f01e189dc00153ccaf820da6cd35390565",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "d0ab6e1ccbef74310faf625f60d9af70d72bc1fd",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html": [
+   "b858e2be2cc8e46bb5a15d94ba29f05c059cc0d5",
    "testharness"
   ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "8f5b1a70b2142dfb6320ae13d44c60b2cac64b2d",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "086c8b1a047cc3ba7e61205a60206e70e993466c",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html": [
+   "cdd4ddf4ce4aa3da984a2071973bcaa81b1485f3",
    "testharness"
   ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "d0e05376f09fbadadda908b63a078e32fbd7e051",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "74ed8a8903d259d0d87b1b3b533139f5d319b240",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html": [
+   "b7836bba091f7e7f1b3514f538a6e0152ce0413b",
    "testharness"
   ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "41a4c940c123b583128beb4108ba9b3015831712",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "37879ce158dc1f54d51f0c55ed0e13e56f0fd2fe",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html": [
+   "855006c31d967bd2008a3befb9782c2124700cf4",
    "testharness"
   ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "7bab6eff28eabbc0d69644c50a19187d35833fb4",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "b874f1970b1bca5501518450a7bb010564e39037",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html": [
+   "eceeb454721096b80844442bb430b5a1a3e5f556",
    "testharness"
   ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "ce4957f92f0627ffbb6671041b6542c0f178d110",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "08dd0a18a46d224e8b1cec1af6c5457ce4d58d36",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html": [
+   "024396c44f371c9504f435758f5e64b6eb92337d",
    "testharness"
   ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "d940fe023d54829d7ed596fed8cda5494443aa1c",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "ae67228e393ee75705d7bc4ec3d5d2f1f700b847",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html": [
+   "a047bf3477babd476508e3108633b95ba20686ac",
    "testharness"
   ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "edb49e27f2373a118de1577cbed512295881f4a3",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "f48a02175888868fb4c780ccd50b6912e98bf9d0",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html": [
+   "ba9982d8e7c67627f6a6d70e209d108468c690f6",
    "testharness"
   ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "795774b4006be2c6bc9a0b97ae1dbdadde07945e",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "8d4143e4ab99b882344ef6834c6f19349d7a42c4",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html": [
+   "c7de2e6f0f2309380c54112eeae01a8d6c9c23b7",
    "testharness"
   ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "68547fdbb73d4ee73789d666e7972c543a14ad48",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "acf4458a1689b5c795a95eba30e6edeee0aff946",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html": [
+   "2884fcab6ef01c43140539b1d926a8eea256be3a",
    "testharness"
   ],
-  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "6f57c7c4b2b9558f11798154d188bb686f6ef00e",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "e2404361ecd2bbb8706856973981bc90bb249e6e",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html": [
+   "31046accc2753a65d1d2bfce98ea6e3f35f9af9a",
    "testharness"
   ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "66660f05264a01cfdce44bfd97a038779e88e6a5",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "15e978254242857952ad19120cad564ef067c1ba",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html": [
+   "fd4d4237c0d1e56be101100b31faa3f1b77948fe",
    "testharness"
   ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "f5e38ddb803aa273661507ba2a42637341779fcf",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "20dfb8a3d66188260044fd662a9f3f149f074fa6",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html": [
+   "262d8d249c4cfcc6d11defe1f7e7444eaa70b671",
    "testharness"
   ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "661a0cb964cd6b0b14f7a277c870bfffbd7353d8",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "4705a1988873dac499172e22df4f36c344398403",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html": [
+   "819e7d249b05ce6ad724b0bf0f1988e4c0fa3183",
    "testharness"
   ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "66310f711b537dec29306f740c8cb5f5b53da190",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "79be70d7587779fcfd23529c9251da339455790e",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html": [
+   "5bb5c51368257ac21a7a02d66327ab2651fb7de8",
    "testharness"
   ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "d3a7d9627f3b57aa3e07d62e4b943dcf9a17772f",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "4140287d37986189912e979a0a75b4e627e2c8b7",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html": [
+   "558c333c2c31a07fdfeaebe13b980e7203125e3b",
    "testharness"
   ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "0816608f10f042d610c7c469a5864a7bd499ca57",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "4af019d39fb30048889d743c6f9653451327524f",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html": [
+   "0bdeb265ae967ac6543563fe805a8163a4a88d3e",
    "testharness"
   ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "fde81606e41dcf5948de750eb57272b14a6133cb",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "930a9c1450c6133a6df2d1eea83cb9a5fa5a4022",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html": [
+   "fe36ce6c7fad7817a4549ca061f4a79a8493d03f",
    "testharness"
   ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "8d08d63d72816a0814a639fd708966c0a921ebbb",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "dbbc89ead389bafce662b3444d7411fc17db4a1a",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html": [
+   "9631d04e25935897d1acbc7389b913872beeb85f",
    "testharness"
   ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "a190ee179384a86a74ac1ae3b901010c5a984d30",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "3a1d16bec4e29e788a970864066efb681b38ca79",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html": [
+   "c9d2e50d8c9871d8ebe4d81a0af0f1b4f94179c0",
    "testharness"
   ],
-  "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "572d84007c955b07ee118f90ce179646dd9bf1aa",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
+   "support"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "c1a8a0a0bc23076f71a86da443b196a11377cc10",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html": [
+   "6d85d0baea23dd87f5607e2df6356c073367dcc4",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "c5726ef3701ce5a800c7aa4cfdce28022b87133d",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html": [
+   "6586f1ffe24650494bd28b214dc48be72702379a",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "a851d5bd81852bf0ce2336cd28a88fc17711c19b",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html": [
+   "2e98a6433471f6e56eded80589cbd38dbe3f095d",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html.headers": [
+   "180358e691bd449b825e0c8f199d919dbd90c270",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "54e6d02028178da90c8d2b534619f43ee2d70746",
+  "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html": [
+   "408834c03d724826f0efe22a6dc8d740c0438cd3",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "8250944c36f9ceb567215864c1c33a769f0de702",
+  "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.no-redirect.http.html": [
+   "a2f92d657a594db4143dc8c0b0afd4d060d5cf7f",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.no-redirect.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "df0fe535c15765f5356c92c06132f1df8616c27c",
+  "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.swap-origin.http.html": [
+   "51c29e644d93d5922ff4f221279152ea41198301",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.swap-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "e56f9107aae879bab2c5f35c2a045e7639366960",
+  "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.keep-origin.http.html": [
+   "d0725a2557a0d787406fa03be8e7fb2259160eca",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.keep-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "a47e2e0c615533ee25895598be4ab62b5488d6e6",
+  "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.no-redirect.http.html": [
+   "c33acb3704aa23c90a83808a9c65e987b9b7506b",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.no-redirect.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "3dd2c1247dcfea7cd93bc2087da3fafe0d5f9193",
+  "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.swap-origin.http.html": [
+   "48c549827f6072d3eb69ba6c6d326347276b8c02",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.swap-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "256db1aa5849b8a2b885ae07e3bbc8578fd74a8a",
+  "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.keep-origin.http.html": [
+   "853b7ef4836224e21fc8c1a724bfba4c2886566d",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.keep-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "7c05f53f14fc5ab58fc26f855c43a2206b9bc512",
+  "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.no-redirect.http.html": [
+   "9d4cac3345eb2c5c2928bf82fa7664e5c59b281c",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.no-redirect.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "83a91abf2bd9cb353da80067c585c8b3d065887a",
+  "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.swap-origin.http.html": [
+   "c89a33c4635b0de80d337a51f496c2975bb76e7e",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.swap-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "461fce61eef2632281db50903bf79a5692ad42bf",
+  "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.keep-origin.http.html": [
+   "3db4fa975f08685a6230479e30775fe6bb2f95ca",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.keep-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "9d5a65e3171a4a170d55805702c241741caaaa5f",
+  "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.no-redirect.http.html": [
+   "29f691c70ff9d16583c4dbbb1bd98ac5fb5e2939",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.no-redirect.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "2691218635125993c3dff3c307a895dc133d1338",
+  "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.swap-origin.http.html": [
+   "7e27944515756afd9425a9cac927deb7a0f3d439",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.swap-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "d67f6bdbfba04380e6b72188d9757f0aac7a19ef",
+  "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.keep-origin.http.html": [
+   "e7c08bbcaf9db741ff91436e27b260d3d3b769fb",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.keep-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "e1a27e3fbae7587f7bb8c921f86239a65a8cfcc2",
+  "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.no-redirect.http.html": [
+   "69607cb07786e074605bd7850ef7924eaa61dbfd",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.no-redirect.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "bfd73c92dc65b50efc922f48ca34e1762e8568f3",
+  "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.swap-origin.http.html": [
+   "d7d0ba3b381b497eb9994c677b87636bfe24b7c8",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.swap-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "4b61d4478a52a60bf3f95add7677752ec4cab129",
+  "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.keep-origin.http.html": [
+   "47c57013f44880515b670830216cf7ead3a6da9a",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.keep-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "eb4e0b3414d0511e36f9fe370e6e41398b5322e8",
+  "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.no-redirect.http.html": [
+   "4e3bb1a06fd89c00c5ea7de98c1634a908ab5d7c",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.no-redirect.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "7ebd1199cc17c7c43279da621ce8f36f44954364",
+  "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.swap-origin.http.html": [
+   "5a7ab10c4130aaace0289ce52bb816f91b4b84da",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.swap-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "4567526881470cceaa21e2086f6c306a069402da",
+  "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.keep-origin.http.html": [
+   "7f1d12f1079ba145ea277d4c7a0ff93d970ba42d",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.keep-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "fecf19ce75a9c890a0661dcdc9366991f121d46f",
+  "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.no-redirect.http.html": [
+   "1b06a5a9545177720d8f8ba18b823ebb1401e507",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.no-redirect.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "8a07db8736e2acc769c4c7fac8ac54b7d5dfeb78",
+  "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.swap-origin.http.html": [
+   "e6c56b11744590a22a1a2af13838589c403cbabb",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.swap-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "ab0b3501c392ba16fa2e0aab9e09b6fc63f67842",
+  "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.keep-origin.http.html": [
+   "ddec0c50687507b13e2ea51fb691ca8bc4e9590d",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.keep-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "3493ca250b8bc0a4cad9418e707e2b539bdfb924",
+  "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.no-redirect.http.html": [
+   "3bef6b38ae81ff6aaf7574bb72daa55f8e455d72",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.no-redirect.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "fe714d038bc38868b036bf5fa346c8db5e910995",
+  "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.swap-origin.http.html": [
+   "c355cc7b41ee611d05e34e482d49d98504bb412f",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.swap-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "82002683fc994d4d6185beb62d7daf4f5feef43a",
+  "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html": [
+   "044a0013137bf4d31df4b1c8621b06abe5e286f6",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "f84861f792a43b3b0e3228defe7e8202320b1f29",
+  "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html": [
+   "bdb0050f72802ce4de9f30048fa2693056bd9b4c",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "8482c8ae977814983da5e706d92f8e3f650ad750",
+  "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html": [
+   "02a0f7364593ffb180d2ca8115b19c34a727c007",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "48168636f4206b5f8ed17bd9a99eb1dca3f50e02",
+  "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html": [
+   "552e0de05dfa97d6c4de3e39fd26477d6c3fe322",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "aa3455bc2df6681a97d1655a0f7c45146d4ee8c2",
+  "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html": [
+   "99bf6df035748485a1c37245a14d7b8cf8f1bd8e",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "121bfdfa4683ee7197370e56e7680f7b756d8874",
+  "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html": [
+   "bf2fd15f642180860c3b1eba4359c2445ea08dd9",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "ed2159b64735b1770a2b2a1903addcab2a42bb93",
+  "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html": [
+   "8ba7fc0528c3d7c64baf05a9a0ce4e7a0f475f97",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "4495c5440cb36508d657fb36ab8fcccb19456bc5",
+  "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html": [
+   "200e236256b73371f9363f88991e34ab7660f450",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "eb067ac7967f98aefae9756ba24f2d549400853a",
+  "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html": [
+   "9390f89ac8c2b195028f8b1ac21348d19374d86b",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "72b43aa993607e39673fd7f2bb6739bc9f8cac5e",
+  "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html": [
+   "ea628172c34d7d0e7543a789912e4ed5e10330ef",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "d2cf0366dcaf91ef915401017e2db774356b9aa1",
+  "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html": [
+   "98937d42ace0dd602ad5171ca60074f13f706576",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "34d467754d9014e74a2be9de8f634ccb897031dd",
+  "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html": [
+   "0f5a13efe12db6723b6cd6469b6605fe4b3deac2",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "637b156a282d7fbb6367a8fff6b6d0e8dda9e312",
+  "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.keep-origin.http.html": [
+   "8045577914e534a0f33a1123acbff6bea0bbd937",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.keep-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "ad34824d58d989bf8dcb02ab188bfb27fd8b4556",
+  "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.no-redirect.http.html": [
+   "db12593a4322216ce78e50e99a4817c5e8c7393b",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.no-redirect.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "f89a079a5522fd26ca0ff369e816c521c5066b58",
+  "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.swap-origin.http.html": [
+   "1c276c8fdbbea63658240db5f57af57dec0aebd5",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.swap-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html": [
-   "40e0fd0a8101696e5160f27f1f573466dbea3b21",
+  "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.keep-origin.http.html": [
+   "47f19e9573c882e4b08526868803e18d7bc6e8f2",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.keep-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html": [
-   "a8d3c3ed2b640feb3af9b4cdffcab8dc2b234b9e",
+  "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.no-redirect.http.html": [
+   "b7aa32c2f57e913aaf2acde67ad47c3f295aa3e0",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.no-redirect.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "df047a0ff44e60da7685e4aa5018086b271a7d5a",
+  "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.swap-origin.http.html": [
+   "c2b727e575a030b4128fe346ce7e9ec354eddaa1",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.swap-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "6454292d6f0ffff30293b70c247be2dcc4390361",
+  "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.keep-origin.http.html": [
+   "464eb4cd1b8f15560091474f3baeccfac6aa63bd",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.keep-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "9a9c91976d889f51db875884d6ed2409e51858ce",
+  "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.no-redirect.http.html": [
+   "1ac4dfe81db8fc7c62f65012a5e9f86edccd2d01",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.no-redirect.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html": [
-   "fedae8b7f7ba3b0ddbab6c2eeba1e402e02ee90f",
+  "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.swap-origin.http.html": [
+   "9d133b182e19ae1eb4ba90277bb1587b53bdc354",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.swap-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html": [
-   "31892705e0f4ae3f8ad112b62b1936240177ee3f",
+  "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.keep-origin.http.html": [
+   "86255c2a2390b9156700b1a14d044c13b3341721",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.keep-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html": [
-   "c3981366c5d6bf4dfa44d69dcbc8e515c8535578",
+  "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.no-redirect.http.html": [
+   "0d85292886397c4e15209f477ee612871eaa3267",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.no-redirect.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html": [
-   "daf2637065ff39c38e78456ac649f8ef3249c3c6",
+  "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.swap-origin.http.html": [
+   "734134e44feaa699cd9579b22798a12cd154e6e0",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.swap-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "eb5e616ecd612bb803779be517e69fbfd241d250",
+  "referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.keep-origin.http.html": [
+   "6aeed041c1d61983f3753ce21c1308962e433942",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.keep-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "abbf8fcb9149b2baa5da1b3d3bb2911706da1731",
+  "referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.no-redirect.http.html": [
+   "c3825ec079ca3eb6f9757dd002adc7ae7232d894",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.no-redirect.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "b5f28d2d6715d8d3bb490158b850ec79c8277d02",
+  "referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.keep-origin.http.html": [
+   "db76379cc9f66ce7c6bdf5fd215243600f29f34d",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.keep-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "3780ae41833ddd01d7bcf3e790d9b2a406601812",
+  "referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.no-redirect.http.html": [
+   "f71ac8e8f40015e83bf256f2d29ba9cc4c792966",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.no-redirect.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "e40426f78a8bc2c6ffd5e81fd082e6ebc40f93e7",
+  "referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.keep-origin.http.html": [
+   "b0be8268545f5a151bbb763948102cb23704e85d",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.keep-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "a4bd83ad28451fe33929346895d7b9fc9f9c26d0",
+  "referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.no-redirect.http.html": [
+   "475110a72fcbaa48343b1379f37ef7664177d29a",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.no-redirect.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "6696fba26b30ad3f6638d3314bbd74d19c09b915",
+  "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.keep-origin.http.html": [
+   "cfe73628d05377f9f23395b28a141dafb7e33267",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.keep-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "fbb4fa45f7dc5d5b56aea75a3ac47e267bc98ff5",
+  "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.no-redirect.http.html": [
+   "17c0bd59f0d0603dda51cea13638e6ac2d92163b",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.no-redirect.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "35af16f4dcacacf6ef56335dd339dfa21d870763",
+  "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.swap-origin.http.html": [
+   "a7b975cd61929f055eea3d72bbe9d59ce7269586",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.swap-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "0c1af722041020338852a01b733db81bcd2624f1",
+  "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.keep-origin.http.html": [
+   "7fff66d3a493ec2119d55b1b67a833a4b12de458",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.keep-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "d2bc6fd484272f99d7350bebd7d04c981429d63c",
+  "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.no-redirect.http.html": [
+   "9d1fe3455158560113448681dfa593ccf237c23d",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.no-redirect.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "7cdfc9bd414cce2469ecae938c5aed125cf6201e",
+  "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.swap-origin.http.html": [
+   "9edc5d8ab07736fd42dc12394e8559ab66fd7e2c",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.swap-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "6a1d773f91b7df881e39ef5e06a7a1b76493f019",
+  "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.keep-origin.http.html": [
+   "43f324a85c9393255f5f69689cf75ebed8c650fd",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.keep-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "47c4a60aed7171e3648cc995f6191f34c1fe07fa",
+  "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.no-redirect.http.html": [
+   "22709fed295cdd87b3b44f5da20c729817c9acfa",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.no-redirect.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "9e95ed2ef1bc611fa488f9e19f329c2183bf1318",
+  "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.swap-origin.http.html": [
+   "25009254d8e8876882d95dc9aabae80eab952976",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.swap-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "2a897d97add20d1f759a6e7750fc2e6da3e90953",
+  "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.keep-origin.http.html": [
+   "6be0685716cd37678fcbad5d28b73e75e7601bf2",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.keep-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "507432c9db1093c3803dadc418fb4697fe606a97",
+  "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.no-redirect.http.html": [
+   "52b9fc83154686627bec2a3c94b7b5af66f5aa5b",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.no-redirect.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "1a6cf6884b9641694947065773c2bd3e028774b2",
+  "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.swap-origin.http.html": [
+   "ef75493d593c0b5a97a8a8c5830bff38084bff2e",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.swap-origin.http.html.headers": [
+   "b3b55087edbb50ad0a371ebb45776cf9943033ae",
    "support"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "2b7beb3a4bb65c63fc672f9b49cc492df742b2b6",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html": [
+   "75f4815eb6b07655aeb3b902cf04308a6b7e4a3a",
    "testharness"
   ],
-  "referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
    "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "ba1fd4a411064963389efb295e796a45cfa8b6da",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html": [
+   "37756d8c5beeca5c3936b31cee3b39beea5c5dc1",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "43df09f493cbb7bbd707cc9fbda62c19836975d9",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "346c0165cf27fcd968caf9d53b5496cd16f292c7",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html": [
+   "3ca0ed8c850d0f07876e0937467e12be8360f764",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "9c19546b28b39bdd5ef06ac3b1a0ef7023c5a7c6",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "dc74b17006404b355ad106c3c22f64cd64ea516f",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html": [
+   "8090e7ed3787a26621e9a15a05e2af8a83d25a77",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "0726049eefcc9de3102576323c0e9d1c8093e63e",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "93b5b91c1619a052136569e93b5738dc48044f0b",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html": [
+   "39c7104194e3592d3d3a60c716af533ce3484f70",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "a09e04cd22c2a723fdf60bc8573bfeecc9e3f4ca",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "9981baec4babe9416ad667f22a95a34e6d8a063f",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html": [
+   "edd61515cb39b9a9a097a513138255bfba7d6420",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "c2a92aa157e3240e589abf87de0620682140356d",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "6b094f9b36ef7d4d1bd4f6baa6c89cd64dddda8e",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html": [
+   "6272ff9bdcf214809824c34861fae87f872af411",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "fa473268c6dfa775dda317b50ccc1b821bd75aff",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "2f8afbe8aed7eebb6ef6cf0684415b0bfd75458e",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html": [
+   "dca65f1663a7e1229e15c8023f91e25eb4ee9f45",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "65cafa2b4f93162958d97321f8ed9d8e8898742b",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "21a268827716623a37efadf49678ae47c08dc4c8",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html": [
+   "a262455d5cb9f6623fdf98781e9f4b57786e6238",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "ce35564bf9d53b15eeb5b4ed1dfd0b7daf95e352",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "80165257482017b8d00e0ecafc47097d68bf47d3",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html": [
+   "586a69b543ef2a0ad0b2696428163dca49ee9b6c",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "47aaeb0646de93bcd665c3e8ac55a89d5a78c012",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "1e3252924feecea420e152bbb7366d62fa031fc5",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html": [
+   "f25400a4268280af5f6a7cf06526505956514753",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "e09bacfa6fd4d75aac18a8a2a4f27b8261ccf484",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "ec641955cab30df8645164e30f9c33cf54c52ad6",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html": [
+   "ef1fcf8da02cdfd9c395974d90a106a74c8fd2f5",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "298ed876f0ab46a3e8844a80914e69d940de2420",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "c80d5bfd08072fc04e3345268b9254637c9f741d",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html": [
+   "f2553d67ff4763052bdd4b5150af41eb0d593b45",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "33451710956896b1a2d7111680b6c408b4bfba12",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "c444cb95402a7a5a85386943cf255fc4d5e0c3df",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html": [
+   "be21cda94d5ab830cedbd8d331d40c5134de6e90",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "8d06c867b75f9f578314c5589a0e5726dfb2fe9f",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "6b4d7aaf3d0a8a53025f314601efdff4353871d3",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html": [
+   "477481d955f22a92578a194fb19b9bd32dc993d8",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "02f1cec108addf48a5d5c9559cd78be1fdc541ac",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "3ab475dd62f5e044fa49b8783c5596283ddfe3a1",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html": [
+   "7c74c301a923dc8846bb76573baec7202363213d",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "180cf23b63f086ef455b7cef74122d507e6e460a",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "fb63204561f0cec851fc1bf1e3ab441ad5f358ba",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html": [
+   "b83ae5afb165ba953ca9fe2f3b021dddcbe7dc70",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "856c6e24e13abad4dc2522d208e29e7e74669932",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "96ac4f9de15e784b4d8143c753a3f81d49c361c4",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html": [
+   "3b87e0e1ee4f4fb727768800fec646b0af91cc48",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "1fdff5963da31722727d5c3bf07ce9a376b552d3",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "05c28a5475dda06425d39f1307f14dff44192751",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html": [
+   "b34218514f0a32b28b434ce65d035e8ab4148976",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "c60ecc104a842fab7f4312da88766fc70499cb2d",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "8d81edd0440690e8d5b47a02aac657506dae6e9a",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html": [
+   "7b9551f94f9e345db33d653b8e58366ced80b524",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "a5a728cf86bbe8e08fe25d7e80490a6c00b5c063",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "df4f87235d0a254751d783d2c94468903aae27c8",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html": [
+   "b3c8f8bc7b71f1ae5b94a3cdacb0086842330da6",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "ec0a21e2db1347f1193675ee6b441351f7b35663",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "6255a8d29cfb3c1c9a73b1e3afe03bd9e62a969d",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html": [
+   "e3549e3092e04fa966f1c4de84ec951eb14a8f37",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "b878f3839f2423e6e9461eef3ecfff98c4364dc3",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html": [
-   "2ce35a6ee3cc31d1ba5d3f92d6ef152199ef272f",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html": [
+   "86d8dc5a296a283d7ae21628c76839955a2ba81a",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html": [
-   "bde8e0f0d13852746fb3e66031865fa1012067a0",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "6b5ea62e345c491b93794a23620679a437cdd53a",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html": [
+   "e676ab9142477e5e83040c203f85d8a56315f52e",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "b39c40d1698f15538b3d1be65d230181d2edcd1d",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "ba4fe78409f3d99a4573ac34c4f02270c3ce853f",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
+   "ed27eab67b06e7529b7dcdc9e4cf497f3230bd3c",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html": [
-   "9b6574020c65557f1fd3d43882409e824975ca69",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html": [
-   "544426d28c6ac3105b01b5426b9c6ef4bf4ef0a2",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
+   "a4f111ba329f3aa92d34466eabbe010ee2636fd2",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html": [
-   "833d0f69136307fea2190ac10ad701409fa8f5b3",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html": [
-   "55709bb0db26860b979631cdab9faafe66beaa76",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
+   "23dbc764034ec63d555908e7a796c02051714aa9",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "a4919c0f7dc086fb9899787d3dba55ca14d720a8",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "9da55918ae3840f81eefc6b14606257fea9f925e",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
+   "b09a25e8006248c86b09337ad8d9d6a027f50ad5",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "9884fb1f072f4b750524f93d7bb6d0c1ca60c875",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "01179a3fab96518fdddda0d4b42f336658874950",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
+   "40453628c96bd394399feaf61ae7f51db8ac3830",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "5a27c133476c8140e5aa5c972821e28665c52588",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "915801c177d81b35da87ed448c21aa19e4a45633",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
+   "548a99f10bc5996c832858149226630cd0880777",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "504092c875fe6d3f56866192eadf86bfae8a0162",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "f128c96d648357100d43c1a7b9c054957b73e162",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
+   "ae909bd86848470366e241fa389ee6675fa402b2",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "9ffd13b1c9fe713ae6c1d78a65ac3b369e4cd42e",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "c3bc40e34b88bb5a2f5fb9c3e20137554b21aa83",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
+   "4bb4990a18c94564962ed81897099db6237a1df8",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "5072cbcf152f74bc9fee63a69c514d1d984987c3",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "6941a3a73a35a8380b5d738588f84a7172ac51bd",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
+   "45781d6ccd8915bcd17f9fb4a49fa89f9e991ec4",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "cf296add12bf0872948c65bd8042cd1e74869100",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "6219c76898f622203fdf7fc04d40604abf7c00ba",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
+   "99a9367616d460012cac0b4b86545ad6a550ab64",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "3a2ea609daa8894fbe11be08d2910164e887c529",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "c9bd5781db9f45f53ce9c002cdf5d293f37de768",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
+   "23f279f394a49d22ae3da451c916942174a89865",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "28239d6b595a0643335a5b18e068c8314e30e401",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "cabb0193e6dfc7c6018e66a617d07abcf7226dff",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
+   "a2197378de89fa319b9b54c34a7a23ebf7c552e9",
    "testharness"
   ],
-  "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "22147bafb08d6de30e1ca858ff0a5d2dbc8a43cb",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
-   "630393ca7b7c8d068bc663f5d02a320feb5e1f2b",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html": [
+   "cc79bca168ca3a7f666fefb229529309a90f26a8",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "660496841a4b67db9d6ebab4879128461e3d0b82",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html": [
-   "3f0455561a7cc68805855a198a064c113d7e34cd",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html": [
+   "1a877c7a62fac6644a9d99bc06c6ba0f33e0a8ff",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "58a3e67dfb7d773ce133f037a987cc1194bc80b8",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "fe7d67eac06ea36525e7b2d7d28a3253964a1ae2",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html": [
+   "820c56c29900d9c1af3332b23423616cf9a2c85f",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
-   "94d9aa008c80313c6e71a26715f3c932c931360e",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "5b7d1de44cc3a09201e37e345f71499302d6179d",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html": [
+   "64764c8002ce75f754fd271bb88a579ff65aa2e4",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "8b6ac65947caa0fe6b143aa42884d523f28dacff",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html": [
-   "2f6692c42930b568c7862dd5535c0832d0bb2e0a",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html": [
+   "310e2242d2d89ec1f2f1591bf94c84e5ed8444d7",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "93e56189dfb6af99d27a33ee75ddf8bdcdfd3a80",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
-   "baf2fe784407fb8e1f32fefc8735b0a90ae77367",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html": [
+   "755cb361f232a681a920763ff61c88b07f0fed99",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "0736088aa841d21dc4a27dae62260332ed9b208c",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html": [
-   "e6de3ee6078627f082db8f720bd4ba880215d5ae",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html": [
+   "d4d2b40461cd5d18e038224743a6333b03957fb1",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "eb27059a957ff35608a8adda4a3c44bf4c6e877b",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "eb1c0191a3bee7f8397e35181eda73fece70459b",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html": [
+   "552359471148c56f9f966402fda11f241f88c652",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
-   "9d006903a0ecb7eb4f64fb4444e84241e5a60525",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "911649a5d14a91e50d73446f93ecd407fca79642",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html": [
+   "e82ea504715fac8cf8bf470741c961f1c5e0525f",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "27cb0340e0f7a640871797ad23916bd752c48050",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html": [
-   "08c297eae3be1e54e4a4801bdbfb12d5e7475a22",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html": [
+   "c0009b6a50acb5f4c1732ebc5c3f32b2d3a4f479",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "3b72cc842c99c49b59fe0c0abafea1a90205120c",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
-   "89532a53691ecf311dc1d91e4ec95b02f92d9932",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html": [
+   "82af386aad9c2fffba6e9c1a2dbe64555cd7c83a",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "959d00137c02d62fe2b295b9b3a24ddabcf94c6b",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html": [
-   "7ba2e047912035f0455dda6e854cbf40befb131f",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html": [
+   "c77c8f20211f7c273d7be02e450fa60c8117234c",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "8b215bc8f4ccea682e8f4e426c5561287ee3dd67",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "4c4ea0c52d51fd6475a72bf8738511f33ba84883",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html": [
+   "47ef7569831efdbf834c999a94a1051d6cb93585",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
-   "3ae29a17caa29bc0f0721070b752ceb9948df04c",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "e47bca42c765f858671353650023afdf9ce763fc",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html": [
+   "12f851e769bbe5122ff8b6c94fee9a483e8f2c37",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "c6421476aef9df2ee76315bcf69306a3f3e3e65f",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html": [
-   "77c266d21e2f8c408b265f0ca819f0bb4ca2e11a",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html": [
+   "5cfd674ea2299f38c7f446327d8d8f58017aab0e",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "511058ccf50700159c9f8c9dee4c2f5e422aab1d",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html": [
-   "ffc0a2ee559cb7d488c14608a436be1a9f7447ff",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html": [
+   "04f454b3877c227c586470c76a7343cd2a78b964",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "8ede638ebbf1cacb90e222cdd97da87aed440888",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html": [
-   "288fa038a4f41cd64567fb356a3cb88aa52f3f35",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html": [
+   "655c76f1c03485217fa1de2ec906c9aa38909386",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "f8e8509b8c8494df8be4797eedf2277f624c39ae",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "88ab886b2338d25ee790434fc25d8be68e13cbf8",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html": [
+   "0106b3154b8a8b5fc8b27c27080e7e5515dcc4c7",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html": [
-   "f2482c3b3aebd55a69780f16a29899df697ec6ff",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "24ab142cfd7c61ad1dde43544e04c3ba83d1b614",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html": [
+   "357cefe6efb468e92972aa7f4a6b1611b071f3a3",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "91d8a23ea5ea8eac7ddbd8e7e17055b761ad6a3d",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html": [
-   "d486a7b8569bf5597aea470d5ec0a88507ad5f4f",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html": [
+   "25a6a3c97919076db90a59b8b3e4cade6a15d87f",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "bac54212f090b41c7e5c042137d5483eead4eace",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
-   "fe1ec67414d5148d1fdc4578132624ec4e79be3a",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html": [
+   "617947e662cdbc6d940bb460fd807099e3be79cc",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html": [
-   "3d02acfc5f965feb153a82fbc297dc84052b4cf2",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html": [
+   "4eaee8e8e4dca8c2a8e60e4d8823e33ecc0d8a01",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html": [
-   "4fc0a20ca2a1bfa62211d62852d71881c55fa722",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html": [
+   "57e98ebc9157a89b8d8fa5b19caa45b217a94ef8",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html": [
-   "46ca3525e6665b0c3c37e4d39b2ab8d9d740257b",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html": [
+   "821f46b4016ef93eed711c4786181063de30efd7",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "6367857969a0c773b63f0d9555d66a63415870ac",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html": [
+   "1ae656ab50809852f3d04cd1331fcb4e0944b06a",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html": [
-   "dc266208a242be3366cd41be4236b927dbc10db5",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html": [
+   "d95dfa1fd2c8c1c54fb0100c29b7cc50e8ad66f4",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "ae9a1a24c9619592e63a71e30e2f0a27c9e14315",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.swap-origin.http.html": [
+   "e0d685b6fc9c3e4ca08ebff64732b7950ab33aff",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.swap-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "3b0e4d177d76816be788e6fbe5c447987ab8a241",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.keep-origin.http.html": [
+   "09f77e2adaba862496c42e154f01c5273cecb47d",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.keep-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
-   "fd2db5728fc8048f36507acb037af177264de0b9",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.no-redirect.http.html": [
+   "3ed876f46d4a661e57a16f7e56b1a2e45127dfb5",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.no-redirect.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "b900db726c214f9e07eb4023333e3c0bc079afd3",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.swap-origin.http.html": [
+   "48babe4a998b6da8afe0217900c8140e25abfb54",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.swap-origin.http.html.headers": [
+   "a15ea7c65c8647c29e5ac992286568aa8dc013f5",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "62acabf41c5db52f9547df86f990a382d629d0ef",
+  "referrer-policy/gen/top.http-rp/origin/fetch/cross-http.keep-origin.http.html": [
+   "6cbfb06d497f003453c4c8926e770ff9fabc9f52",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/fetch/cross-http.keep-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html": [
-   "ba056619102a28b940c886ae119af906e5ddd2b0",
+  "referrer-policy/gen/top.http-rp/origin/fetch/cross-http.no-redirect.http.html": [
+   "6bd5806921b2fb10bdf077d1a39f37eb47e5c976",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/fetch/cross-http.no-redirect.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "d86a85b208d772c930913255c55a062df6ae4038",
+  "referrer-policy/gen/top.http-rp/origin/fetch/cross-http.swap-origin.http.html": [
+   "250185ba9f48c655f204d980363fe3daa60a5200",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/fetch/cross-http.swap-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html": [
-   "a5940fd6d948771ac864b1c496108bc6a7b95856",
+  "referrer-policy/gen/top.http-rp/origin/fetch/cross-https.keep-origin.http.html": [
+   "b66c4da0baf7fc91bb120801547ad666cd59a3f9",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/fetch/cross-https.keep-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html": [
-   "e53a0ed387abdc55c4b6f67a3b9d3d5dd23f32af",
+  "referrer-policy/gen/top.http-rp/origin/fetch/cross-https.no-redirect.http.html": [
+   "40a04d29f8814219040a0bd35eaf5d78c6dee1f5",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/fetch/cross-https.no-redirect.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html": [
-   "ebba94e987dca47e7640d1e1dfaadcd0c84b5205",
+  "referrer-policy/gen/top.http-rp/origin/fetch/cross-https.swap-origin.http.html": [
+   "eb1a8f7961942422de208ecbb7561726d756b5a7",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/fetch/cross-https.swap-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
-   "d36ac614868ed5876dfd83d7d7f1baded7be7593",
+  "referrer-policy/gen/top.http-rp/origin/fetch/same-http.keep-origin.http.html": [
+   "e3569f1d503608a3960ba14b5b73774b06fc8304",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/fetch/same-http.keep-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html": [
-   "8ddd158183954939e926761a72a6cdbf14de5602",
+  "referrer-policy/gen/top.http-rp/origin/fetch/same-http.no-redirect.http.html": [
+   "1d138fae4c42f9d7163ece7ce65d00dfa8fbc053",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/fetch/same-http.no-redirect.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html": [
-   "3740814c4419d8b219acce92103bb2bac262db00",
+  "referrer-policy/gen/top.http-rp/origin/fetch/same-http.swap-origin.http.html": [
+   "092fec8239c119c983a504e44dda34592ce459c8",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/fetch/same-http.swap-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html": [
-   "461c255ec906b0acc01acdf11fc1655228512193",
+  "referrer-policy/gen/top.http-rp/origin/fetch/same-https.keep-origin.http.html": [
+   "7202a43af1e6ca02e62b041b6a8bbc1b8e5f0c60",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/fetch/same-https.keep-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "f8cecd0d79184464fe81c88b604815601477ea94",
+  "referrer-policy/gen/top.http-rp/origin/fetch/same-https.no-redirect.http.html": [
+   "199f948f395ef2b0f4b4c97058a7e72acaf6b02a",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/fetch/same-https.no-redirect.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html": [
-   "e1b46f72b9db5b9af8a42b45084c18d14e68a3ec",
+  "referrer-policy/gen/top.http-rp/origin/fetch/same-https.swap-origin.http.html": [
+   "e254d58d35f3f84e0d22e2df1a8a868fce81d8e8",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/fetch/same-https.swap-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "010656cfb05464a5cf92b6e81e3aab8da37ca910",
+  "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.keep-origin.http.html": [
+   "0044911c2d896d6c074f4248184edbdcc5c20b5c",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.keep-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "0feafdce56ef60e3ed92f78379b6a20d81de29a1",
+  "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.no-redirect.http.html": [
+   "fd06406bc98bfc54a1e1aebf0962817d45e7b800",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.no-redirect.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
-   "a72089286fb826bf64b2622527dd299c251577d8",
+  "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.swap-origin.http.html": [
+   "e3ac6f648e3e8c2d5fd373405607563711a8c978",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.swap-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "db33032990969b2ca2c98ab946ebc8294b75fde1",
+  "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.keep-origin.http.html": [
+   "78b5cfa3bb9fd7e1a266ded3a92d9565ab960be4",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.keep-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "47e98f19d009e7d71ea1bb2b5e14c845d20716f8",
+  "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.no-redirect.http.html": [
+   "86cf62f479d2811cc469e328d0c38ba2d5cd3e59",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.no-redirect.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html": [
-   "ddf8b522b59c69eb555051dacb2ab247634ea273",
+  "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.swap-origin.http.html": [
+   "58ff33f802400a81f234a7af9af9306b932f7996",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.swap-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "17f72f727026c968018ee8b5f0dfb788ef67a910",
+  "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.keep-origin.http.html": [
+   "51910edd9d3d4281c3888843fa6d11dbe5f22506",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.keep-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html": [
-   "4dbd0d1e8c51f8094d85b289d499d734e76743f3",
+  "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.no-redirect.http.html": [
+   "3432542251d92d9ed58831064f97c454ca628e26",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.no-redirect.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html": [
-   "01b339b41d22f5bc6a951aa5fd8aff63b4255000",
+  "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.swap-origin.http.html": [
+   "f0827d96efbe8f8439de317e1acb98a0a672517b",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.swap-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html": [
-   "07a972315fc2b7a78fdd005996aa667fb5fc0b10",
+  "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.keep-origin.http.html": [
+   "a9fc93d6b541824468462db3e7fff03e1c97972a",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.keep-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
-   "f4db0be0e50a3e66d7eadb2b1eaeff2fa1072509",
+  "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.no-redirect.http.html": [
+   "eaf0c719cdf57d48270861538cef2509bfbc140e",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.no-redirect.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "befe72d96952d108419428bccef26144744e38ed",
+  "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.swap-origin.http.html": [
+   "72264666b1326ca93485d618e009a19a0ba11241",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.swap-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html": [
-   "b2eca76078f98d48815263a0fa1ac8002cf8d7ea",
+  "referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.keep-origin.http.html": [
+   "16ea22743cbf29ff6bfef58878a11f6ebe6abe32",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.keep-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "50768c30cf4808e62feca3447ff7fff25ce26d9a",
+  "referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.no-redirect.http.html": [
+   "eb9dcf7831813b6bbb06103635f7660e67642d3d",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.no-redirect.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "8fae2caef61c064bbe211e5c7bf25e4ac7f5bf32",
+  "referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.swap-origin.http.html": [
+   "1872a9310f73cc13ea157b5ff3d4b2a9d713863a",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.swap-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html": [
-   "4a41087b0957293569d7b5b9b22333a762b1c112",
+  "referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.keep-origin.http.html": [
+   "7cb2e58c22f99008aada61b3f77e8efaad2b9af0",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.keep-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "b6a898c1ad2ba01d8d65ce22c70cc98792d716c8",
+  "referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.no-redirect.http.html": [
+   "5993c1a4dc4239cdac7d531a3aef0ac0ed78a511",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.no-redirect.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "a26f0dd202efa7f762250a60aade5a834c4fff0b",
+  "referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.swap-origin.http.html": [
+   "2a00f3c6fdc736b1e3cba76310beedd091879a12",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.swap-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
-   "8b178d9990ce8e354d481ce53a0f259b58495655",
+  "referrer-policy/gen/top.http-rp/origin/img-tag/same-http.keep-origin.http.html": [
+   "f41dd8ed255f7ca0b2c8946ff8a7c2616a707f81",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/img-tag/same-http.keep-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "0a46c97106b3bea9148faeb0cfa22a53b287519d",
+  "referrer-policy/gen/top.http-rp/origin/img-tag/same-http.no-redirect.http.html": [
+   "23f60063607862cf423b08a109788cdc941b9d0f",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/img-tag/same-http.no-redirect.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html": [
-   "cc92566b86d5c51a99cdb88d2b2befe7b942391f",
+  "referrer-policy/gen/top.http-rp/origin/img-tag/same-http.swap-origin.http.html": [
+   "17e0f0409963b0cb59a6bee9c3da8a41423d25c1",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/img-tag/same-http.swap-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html": [
-   "9992788652176c505f9d33ccfd9df07dedeb8b2e",
+  "referrer-policy/gen/top.http-rp/origin/img-tag/same-https.keep-origin.http.html": [
+   "3c0453f8617984dcb2dcce32ed123966ba1f7011",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/img-tag/same-https.keep-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "a7d6c72f08caa74b81527baf1c6b359ff39674f0",
+  "referrer-policy/gen/top.http-rp/origin/img-tag/same-https.no-redirect.http.html": [
+   "9d0609167f105fa84ab44f63358eb51de567e1e0",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/img-tag/same-https.no-redirect.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html": [
-   "c4df370a7176dc44b2a7df8368ffac6a37554ce1",
+  "referrer-policy/gen/top.http-rp/origin/img-tag/same-https.swap-origin.http.html": [
+   "6c00fd9985fde883af3b30e7e50ad5240ac7a7ba",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/img-tag/same-https.swap-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "8c45a5dac2060916108e47d34681482e482b60bc",
+  "referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.keep-origin.http.html": [
+   "5bee1774b3f3c80b27f45eb07629c2fbddb5cfdf",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.keep-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html": [
-   "bd13da2a29235068d2a7c78762e9d951876f82e5",
+  "referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.no-redirect.http.html": [
+   "580b42e0c9962bcd8202e7b78d9811b94e9d467d",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.no-redirect.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html": [
-   "3c53fa01167f51f8d848eeb95f236c6fef48b190",
+  "referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.swap-origin.http.html": [
+   "413b20aa2bd183f5d106d87cac71e36fa53b5f1e",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.swap-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "ec3e284c3c517e5ac679d5539280f36730a1a197",
+  "referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.keep-origin.http.html": [
+   "29f367a04e85860006a6f6ae8f7fc32715284a60",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.keep-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html": [
-   "e6854db2f3d460c70803dff7cdf8b2fc314e0e59",
+  "referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.no-redirect.http.html": [
+   "d2c5bfc2bfcf2c365e6c53cffaa2d7acc3c7a6de",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.no-redirect.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "526c2648432649ddeeb9243c95075f21d65432a7",
+  "referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.swap-origin.http.html": [
+   "63670d985975364bc8bb2737244f408f54b87549",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.swap-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html": [
-   "bbf21e785f331cbc60fc74d90b297f9cce2b2bab",
+  "referrer-policy/gen/top.http-rp/origin/script-tag/same-http.keep-origin.http.html": [
+   "1b150f1cf653b82a7b02a25f2290d9e48513f709",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/script-tag/same-http.keep-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "9cef48221ac71c385e94da70662eb003a1ade758",
+  "referrer-policy/gen/top.http-rp/origin/script-tag/same-http.no-redirect.http.html": [
+   "3b8b1ced9008cc7bb279e08b6c6f0b0246ffac44",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/script-tag/same-http.no-redirect.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html": [
-   "e9125ad06822298506b35dda16d51f1273c3d03f",
+  "referrer-policy/gen/top.http-rp/origin/script-tag/same-http.swap-origin.http.html": [
+   "bfdb519d4b4a07b6bdb5ae6e6b180ace3e4e09b4",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/script-tag/same-http.swap-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "4b59071d48b6106bea107ff835c621979b9b174a",
+  "referrer-policy/gen/top.http-rp/origin/script-tag/same-https.keep-origin.http.html": [
+   "eec55f1a686a9389721e861b93c0fee5734fce99",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/script-tag/same-https.keep-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html": [
-   "0a8ce7cfe019b0a69c6579718a093714d7da2d36",
+  "referrer-policy/gen/top.http-rp/origin/script-tag/same-https.no-redirect.http.html": [
+   "028ccc9d419e84845953d4d39a5bea7b289e49f4",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/script-tag/same-https.no-redirect.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "09f21bf5294019cf3c28527510a8ece967342884",
+  "referrer-policy/gen/top.http-rp/origin/script-tag/same-https.swap-origin.http.html": [
+   "7c9efe9c54023d8378fb1820008cd5d1a2d77415",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/script-tag/same-https.swap-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "53229010cfde7ae29820198175f51b16f7cf256d",
+  "referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.keep-origin.http.html": [
+   "0e8b46c950402fd1e90c053cd7b6e5a4606e0ed0",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.keep-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html": [
-   "6a53bb812b332c38ed91bb8264c7d7ca31dc5bff",
+  "referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.no-redirect.http.html": [
+   "13249150441cd2833076b10a5f8ac9870d388e40",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.no-redirect.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "dd27004c1c42d367f53a6dafba279783ee1f501e",
+  "referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.keep-origin.http.html": [
+   "516598a940825c04fb873d1a60b57d4569c36c27",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.keep-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "131c0e0893acb016b8e75d3fe7c490155b025466",
+  "referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.no-redirect.http.html": [
+   "d2b60caa30da56690e93f9ceb8b08ac07b288d02",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.no-redirect.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html": [
-   "61753d6188a4d09c602317a0bc85904fdd300b10",
+  "referrer-policy/gen/top.http-rp/origin/worker-module/same-http.keep-origin.http.html": [
+   "7c4685d0160385c71a6fa3c35553231be43f634c",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/worker-module/same-http.keep-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "e3cd061000348e114d4d99604588ceba4688a7f6",
+  "referrer-policy/gen/top.http-rp/origin/worker-module/same-http.no-redirect.http.html": [
+   "6d60f9473ab9ef5a57b29245470111c3c5825cef",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/worker-module/same-http.no-redirect.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "6c8a0fd643d07b393a2006b91d6ad07cc8f7eeda",
+  "referrer-policy/gen/top.http-rp/origin/xhr/cross-http.keep-origin.http.html": [
+   "d1cf15a5745deb5dbecd3f81a8847f69c61dada8",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/xhr/cross-http.keep-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html": [
-   "5c6d59f53ec20186ecfd41f7a201254a7a25c956",
+  "referrer-policy/gen/top.http-rp/origin/xhr/cross-http.no-redirect.http.html": [
+   "fe4f588ad949fe8e4a2ac8d40f84cb2dce86d68c",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/xhr/cross-http.no-redirect.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "4ccf6b24c826e16fd777a7be85daab905e167c59",
+  "referrer-policy/gen/top.http-rp/origin/xhr/cross-http.swap-origin.http.html": [
+   "4106f858486b8ef01372356a5facb641c72d77c3",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/xhr/cross-http.swap-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "07887aa6a61e8cd3d3dde5eed460706747b56515",
+  "referrer-policy/gen/top.http-rp/origin/xhr/cross-https.keep-origin.http.html": [
+   "09fb97ad9522eff4cdc3e9dd414e3aaff41fca97",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/xhr/cross-https.keep-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html": [
-   "a226cfc9422b2c890dbfbf45fac61a77bb71365b",
+  "referrer-policy/gen/top.http-rp/origin/xhr/cross-https.no-redirect.http.html": [
+   "5f6c2bdb9e0389113a7a482695bbc988930552f9",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/xhr/cross-https.no-redirect.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "9d2cb261d6ed481802a79c763a93d2afc76c9712",
+  "referrer-policy/gen/top.http-rp/origin/xhr/cross-https.swap-origin.http.html": [
+   "cb8df81462aa50ad68313124e4ba08197ad82736",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
+  "referrer-policy/gen/top.http-rp/origin/xhr/cross-https.swap-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
    "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
-   "7d128a216ef75637832ff7a396834471efc5c417",
+  "referrer-policy/gen/top.http-rp/origin/xhr/same-http.keep-origin.http.html": [
+   "8aca08162ba29a5a7d31a06eddc9c5671e204c7d",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html": [
-   "f95a61709ba79dd1cc02cab834ac3092edd9dd6f",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin/xhr/same-http.keep-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html": [
-   "e5c4a5b9d708b5decf2d34476e72881c005da9ef",
+  "referrer-policy/gen/top.http-rp/origin/xhr/same-http.no-redirect.http.html": [
+   "c6d243af5548bb36602af9d8d92366dbfc4139a9",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html": [
-   "6b69d4f3399ad85f1a31c390e85b9f2300e3de89",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin/xhr/same-http.no-redirect.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "b36d8e43696277d3b94a225c0e68c4cd71dbbb8a",
+  "referrer-policy/gen/top.http-rp/origin/xhr/same-http.swap-origin.http.html": [
+   "2f672f8f5363d21cbda18c09364ce75d9dab04ba",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html": [
-   "cb22d1880e1df36b66793c9609619218891bd98e",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin/xhr/same-http.swap-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "10c4f95342800956f51ce42a808cc88460b738e7",
+  "referrer-policy/gen/top.http-rp/origin/xhr/same-https.keep-origin.http.html": [
+   "dfa0026566a6551266e327f9e81da4227079e6ca",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "f93f8399ef7a63d1bf2bccac4c1c425381ffb94f",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin/xhr/same-https.keep-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
-   "ef7dfd49fe4b8a0ed379cc1b8818d482c8d81b1a",
+  "referrer-policy/gen/top.http-rp/origin/xhr/same-https.no-redirect.http.html": [
+   "9802aebc81266018e6c74590f922135449dd7997",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "6335b58a250d6dd753fdff0d1d726914a2053deb",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin/xhr/same-https.no-redirect.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "9087f457aa760306ec583d5d568300702f09e172",
+  "referrer-policy/gen/top.http-rp/origin/xhr/same-https.swap-origin.http.html": [
+   "823d510fb7374687fefe85c116fa42c1757c3f08",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html": [
-   "cfbb2478acdd5678c931dcbc45b6359264838696",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/origin/xhr/same-https.swap-origin.http.html.headers": [
+   "ecff74b90dc209912b003388bcac7ca584b12762",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "562bc513b1b6f802f25a8e73da60965bec0043d3",
+  "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.keep-origin.http.html": [
+   "b0c2bb827833a0b7063db45c84379394201abcc6",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html": [
-   "2aa2cdd9b4cd11bf00787f6ac781359e467ce365",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.keep-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html": [
-   "92b2a2069cfa6916881dcf35d434da9a6b0e4c70",
+  "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.no-redirect.http.html": [
+   "4b04c2b5f22b33bf620f791b0b448ca7fa5ef4f0",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html": [
-   "9703cae9306952a4139e94e8975725fd136e8b42",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.no-redirect.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
-   "bfae1b4ce35cd823606a7f5fc14fc0112a53b8b7",
+  "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.swap-origin.http.html": [
+   "53818e453281a1369c9277ea98a2c304de196709",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html": [
-   "8f5342fc17a5766ddb7b91d012b4f50a5461be97",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.swap-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html": [
-   "c4f1a54f2c66550b87da3b40f5c8f7d791c93c54",
+  "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.keep-origin.http.html": [
+   "50eedd46d534dad4c9e19152a9e22196c9b887dc",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html": [
-   "1b961e3dfb4979d4a5d6f9f4e03a9740f9c5062c",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.keep-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "137aa7e3af898e5f6d84cea5ad871ebe5409f3ab",
+  "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.no-redirect.http.html": [
+   "594d1e2370921250d44fc0a997175afa721898f8",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html": [
-   "1703a958e784b6839a74a274b8f8352c822a095d",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.no-redirect.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "c3c98c4d4409583cc8de4acc1b64b9f82ead18c4",
+  "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.swap-origin.http.html": [
+   "b52735fed340ee526bb39ac9aba470705f197371",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "3d8e32017d195ab4252b2507943a4fa8cc006b09",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.swap-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
-   "9fa4ca3c127760d4889756e89839e65ae0a66d34",
+  "referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.keep-origin.http.html": [
+   "88168ccbf8c4f7e2b588a7d44ffe2ac5c8b7f5dc",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "feec6a71fff2d37100ce6a907cd9ad38cfa5cb12",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.keep-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "c1c349086bc4b26c482ff27705c1c17090ccb88a",
+  "referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.no-redirect.http.html": [
+   "5c6b99310ee14cfbdf2fd47cc096e1bc7482a5c8",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html": [
-   "a796ddbddc449d2e8b480598303458110fb1456d",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.no-redirect.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "cd2d7972f0d9a9cb7c62086b517a3f287effaf4a",
+  "referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.swap-origin.http.html": [
+   "dc653329cf19e0b06685a5bdb992e0b85a6bbb8e",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html": [
-   "592768a121ef135ad5e6f533bbd50d961311ede6",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.swap-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html": [
-   "7824367f87b613e9deafd127f6f41b830b68a029",
+  "referrer-policy/gen/top.http-rp/same-origin/fetch/same-https.swap-origin.http.html": [
+   "d7cf4f1fffd4a45684e1f3a2c7e1b5587a1edce7",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html": [
-   "7f07485e08e69aaf2ef8ad584182c1431f0b1e5d",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/fetch/same-https.swap-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
-   "c9d64acd3ff519673914c0a921d1d4c6730d4ab4",
+  "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.keep-origin.http.html": [
+   "3efc9cd5a379be758e3d9a16b09ca8d78ba529f0",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "8d8aa7b1407caba05ace8055ccabf0e59f830d8c",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.keep-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html": [
-   "585c54a5b78d7cacc85dbf2dfda0f22b2847d463",
+  "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.no-redirect.http.html": [
+   "16e6f6c59ffca07f212d42ebc853a5b51fa700e4",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "53e908467c899a2ec44bcd649503d44aabe27e35",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.no-redirect.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "48e6c69b5557c4d0a2dc359f9562c81bc2d98c2a",
+  "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.swap-origin.http.html": [
+   "03bc1011caf9bee509b53c534035d5897ab87cad",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html": [
-   "aa3dda32d62afe6a5997b80d5bf3b76dd920272c",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.swap-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "d319c671e1fff162309345b0c32066dd1c4cfb01",
+  "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.keep-origin.http.html": [
+   "29d622ea25ed03c52f6f09fce19f3ce9123b41bb",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "2986e09860fd2ee0b6847efbf483c4ebc2a3b2fb",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.keep-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
-   "b44acdd3f3bd62b513b1d41267e2810476ec65db",
+  "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.no-redirect.http.html": [
+   "e4322a6a1c740e20eca230640f9a1c119c29794c",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "da358ee0e1c90cda547d6e25bf2c4858db18ef29",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.no-redirect.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html": [
-   "2127ef3ada6999f1e1c1ff5964b1ea661d13debc",
+  "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.swap-origin.http.html": [
+   "9ed0d18972a7f3aa313f018576c8ec7b7a4d1d8e",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html": [
-   "cfb23ead04437265b61cb4531c929991ee3bb18d",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.swap-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "57db10fef105cd14ec0f6c74204533c328c0c6c7",
+  "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.keep-origin.http.html": [
+   "5692389863e8b2d4904343daf2e7bf2430d65d13",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html": [
-   "e854d09454f1061c079a867cdf0080d0f3b310c5",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.keep-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "58993fbddb9315fcbae4d9fece540842cfb13a41",
+  "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.no-redirect.http.html": [
+   "45819d53de3f8268b13da319129a02999f777649",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html": [
-   "58588cbd89f1704af989f296d4db656b89d59ed8",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.no-redirect.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html": [
-   "57abce25ec01003afeb22eba5ede3f4a032d638f",
+  "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.swap-origin.http.html": [
+   "38fc13c75046b6a0cdf08851424df30c8679c5fb",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "73a9963f1f09c29be39e2c87f0a96dd048345d85",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.swap-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html": [
-   "e5d89fb2d20b92c6fd79920fad9db36a3425361b",
+  "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-https.swap-origin.http.html": [
+   "604a68f372c5e01ac84f03c1a1c9fc8a2db727eb",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "f69d366a327ce38af4e4f6bf5f6050228e1495d4",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-https.swap-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html": [
-   "ee0f051f770363169c67cc362fb06f0f12975384",
+  "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html": [
+   "8c9e523158482fb9ef838d725393211a70f9447f",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "ec455a6aef7bb4ec4f970dd477a3abce74ba7728",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html": [
-   "a709e40c51bed38738d5fe4546688fd20095464d",
+  "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html": [
+   "47c03577e3851a382ec5fbb482783ecc2f39d1b9",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "dc2c9d9ab75d5f7ea01e0fdcecf02fe257e76ac6",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html": [
-   "9fbc08e5384510b7587629e3afe6e061d1a7e485",
+  "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html": [
+   "84548e254493a75aaa7baadd33d87e9fe9febb6a",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "3f46fabe37b2e5c7f79a95f5f522c5c7f1e0373b",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "3ca5a0b0d7cfd6570b759509eeed04f66f306941",
+  "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html": [
+   "73b4b43fe3e02be250004f81363ee79b065d41c4",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html": [
-   "a17b3ba8c1737d21cd340e91425d2cb8f8cf4ff5",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "fda77dbd15b820e70807c6ba4c50416b3a3241d9",
+  "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html": [
+   "dbba3b8e30827ec5f5b6049ee01a78d507dc083f",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "140fbb9684b9834702b642c8ccc0f050e68372e6",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html": [
-   "be879a223147a9f9824f63665aea3b7614be1516",
+  "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html": [
+   "c91e2027091845c497083e7a5aa5cd77f1d62e78",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "95973ce73085d514495c4faa60c8612de7e15db7",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "fb2ae653afe0150e29f9fb7c9c5283732623d66a",
+  "referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.keep-origin.http.html": [
+   "f2b58faa4d86f1bf2e17dc7824f14443ce4571bb",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html": [
-   "13669d31a6983b03ce98334f3b59769f00f9666f",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.keep-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "0f8985d142763e74fbfb7cf227515ccde5825d35",
+  "referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.no-redirect.http.html": [
+   "95dcbba40a1b5c100a60927dff9f2397c2d1310b",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "26434dd0a05af0bc88bddecdc28dd5c68c2794d3",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.no-redirect.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html": [
-   "62e3849d679f80d7ffd4bf0c8acb2eca2ba90844",
+  "referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.swap-origin.http.html": [
+   "ccdaab708b34f3dabb65104161c31d0b867af681",
    "testharness"
   ],
-  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "6a09e53315ab7fa644b785f3de0f5285aa05fbf2",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.swap-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "ef0836b8e8759325d50c23bcc206b5fe974e2593",
+  "referrer-policy/gen/top.http-rp/same-origin/img-tag/same-https.swap-origin.http.html": [
+   "1224211f845b2283baf3bd52f3039af924d5b3eb",
    "testharness"
   ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "86f6a004c32706f57518b11600e41212876de0c6",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/img-tag/same-https.swap-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "c404fcf03f9e76a1408f2387b338d9c6335333a7",
+  "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.keep-origin.http.html": [
+   "35fac64aafb0a0881c293d6ce22342b02f499f21",
    "testharness"
   ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "f3f701fd230d672c61772c7054201569a1f59173",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.keep-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "2ea65da273ee14f51844c0ff2cd82d814e0d9901",
+  "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.no-redirect.http.html": [
+   "ccdc442b35a81bc5318eccfccb403cfada422922",
    "testharness"
   ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "90a500cfae7b89c2a8541b58e8ce0804d0ab4718",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.no-redirect.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "79c96e6f2b418a2bd7b07009a0b7d9270b2d8198",
+  "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.swap-origin.http.html": [
+   "0e9b3556af2640c3089f05a7c43fa6252c5b6def",
    "testharness"
   ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "714a08bc7bd4da9ff1812fd31768613d99df042d",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.swap-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "ff7e409b8d98db62ff9f3c442509d66f0e7919ac",
+  "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.keep-origin.http.html": [
+   "e5b72cf07434a86d5b13369037f73f17bb296fc5",
    "testharness"
   ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "6e914683ee821997b67dee5cc1c0daf52986af15",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.keep-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "1a8ab2b48306295d1b8f3eb87d8dfbc50f0b7358",
+  "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.no-redirect.http.html": [
+   "c00d12de0b1d42bf6138b75478fd2b4d0be263d0",
    "testharness"
   ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "4f8dadde3c41e15e568b9a6321e57b9cdfbdfe76",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.no-redirect.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "8f130d28a17578f82edb8543e17aa4b045289b8d",
+  "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.swap-origin.http.html": [
+   "956910d4f8114f650c8b0891580e1c45bbe7425d",
    "testharness"
   ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "75eadba3d1efa74cdc8c978f997963481e2b59f9",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.swap-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "4fe3af9ffd3bb4b077f3c65e7f1f8817cce4685d",
+  "referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.keep-origin.http.html": [
+   "64907c87168282ea35dcb9241ff95bbfd76d4ef7",
    "testharness"
   ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "48631e39d2622d7d3e3133314c761790bdc00957",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.keep-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "3b10e291d3361090bb84e60264154aeccbd17e1d",
+  "referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.no-redirect.http.html": [
+   "09b1c1f74493eb63433e8bcdbb9389239d9cd806",
    "testharness"
   ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "bbc4061c2d27c37dc54d6be19a831c6aa86f460e",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.no-redirect.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "2d2ef35f6812f46c99af481956c3292dc69f12b4",
+  "referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.swap-origin.http.html": [
+   "a5307e7bc4b6164cff02e9d71a65b367f33f7347",
    "testharness"
   ],
-  "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "47c51d9df663b03012695da3516a02e6ab0695c5",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.swap-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "330d3f0f907d853eb503531137c7deecf4a05b6f",
+  "referrer-policy/gen/top.http-rp/same-origin/script-tag/same-https.swap-origin.http.html": [
+   "e15574fbc4bc26732a458071202402e27f077da0",
    "testharness"
   ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "ea15eec31891a4328f5cebf1d47df7d42f151a38",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/script-tag/same-https.swap-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "61323de7a029a42918dffd54dd6590fcdf4d2d8f",
+  "referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.keep-origin.http.html": [
+   "fa383bbb81467b24b2cde3a227a378a7995e6200",
    "testharness"
   ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "c59ee9d340c69148e2bdb886d4d52abae1f8f99a",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.keep-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "51b9ba265647a4b6dabe21e112721d0dce0ce7e6",
+  "referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.no-redirect.http.html": [
+   "ecd1f5a1658447f3d301609ab1857bcedb0dc13b",
    "testharness"
   ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "72e74ac6802a9cf6de29353dcde4dea78c65ddee",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.no-redirect.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "39c651732647ee15c47c8f32c7258442bae8370d",
+  "referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html": [
+   "0271011060137f688da487fc02fab7b6d5b78c92",
    "testharness"
   ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "9af146296a2a51b9c76b3267c93a89c22f4bc3b1",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "4000dd3467dbccd3d31826653b47ad01ff54e37a",
+  "referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html": [
+   "30deddfd1a3eefea98c9f0cc9d06cda603c9bd08",
    "testharness"
   ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "547c19ff4852446c7766e2e7229939ad02ba0284",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "ec64d6fff5a3033dbad357fc7b16a377907a0311",
+  "referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.keep-origin.http.html": [
+   "5a734b9201d3b330b3d12fd3b7b1729234854caa",
    "testharness"
   ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "2623fe82db01c67d5339d87afb0340e9e5b8af89",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.keep-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "adce8bdb5693cf9164c801b358c971adf44ae33e",
+  "referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.no-redirect.http.html": [
+   "fac2c79ad64d31f547833db661131fe0a95f3f70",
    "testharness"
   ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "fbfb700eb942f4f81b60865acc65a95b76d24a15",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.no-redirect.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "68a33b74a18b0d22299f590b925c9485c883b453",
+  "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.keep-origin.http.html": [
+   "d70c192e45add0e8103947e8557f84a8ed0f690e",
    "testharness"
   ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "40e7caed48554bee235dd35989bd1f606dbf33d0",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.keep-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "7992aa6e009b7eae992387bebbdfe9fd04cdbf76",
+  "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.no-redirect.http.html": [
+   "1cf3b441ce999fd89fc9186a32442ac4ffdaf2a3",
    "testharness"
   ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "9c4011d2817e6fa18ad45b98b4cf60dbe862b48c",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.no-redirect.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "b174ef4feca3b4ba3edecdef4b5977f9f81e4783",
+  "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.swap-origin.http.html": [
+   "f8b167293ffb25fd132a9994fdee07f06ad743a5",
    "testharness"
   ],
-  "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "6d987fbcb5253f051dc4d3e2999a442fcfcfc56a",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.swap-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
+   "support"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "9fa486e6ef1b9cad07b3c8574951a506b77c39a2",
+  "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.keep-origin.http.html": [
+   "34413f44d0b83e77bccca9c14a1a593050a6596b",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.keep-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
    "support"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "5577dd290e88f325f369e56ebdfe9f1d94db979b",
+  "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.no-redirect.http.html": [
+   "2dcc45119a15ab547137105c542956fb8effd911",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.no-redirect.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
    "support"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "3dfd7e3526ccfce8b642ad96cfe65eb256f639dd",
+  "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.swap-origin.http.html": [
+   "843b7b8bd8e5e325748d0ddce9db0a319848d2c3",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.swap-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
    "support"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "5fbda64f1dfe568f6c365534940d3e638fc5df6c",
+  "referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.keep-origin.http.html": [
+   "e8e560af2a0dda4da897625376dbdda427e7f252",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.keep-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
    "support"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "b498a7d7a3112feacd4377861ca4d0b16465140b",
+  "referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.no-redirect.http.html": [
+   "12198095da24c25ee880af6c5cd7492c2afd814b",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.no-redirect.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
    "support"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "cf30937880f520772ccfc5dcf624f6e5247c426d",
+  "referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.swap-origin.http.html": [
+   "300bcba4cf80b031919a7eb371d2f1b8c0b818ba",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.swap-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
    "support"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "5123048a9617309152bcd479671d6b6057691daa",
+  "referrer-policy/gen/top.http-rp/same-origin/xhr/same-https.swap-origin.http.html": [
+   "82729f56cca7ce6a81478f240171c1b3c74044f7",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/same-origin/xhr/same-https.swap-origin.http.html.headers": [
+   "be66cf9321103b1397670f3acc89cecc09aabec2",
    "support"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "1a6b871132705b6a9673af3cfec02438df0dce8b",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html": [
+   "856bd37ac9bfd9bdad5b035c8e4573dd881fb8eb",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "6ecead7d50e338377abab19dd7597cf4fd94e8f5",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html": [
+   "fd4826682aca7e2d8167cb094e9848cee807771c",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "abaf6d3efb894927db66ffb481db1a11ca61e8ae",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html": [
+   "fd82f1b1104bb92e6e34d864bbb46e09933c9515",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "849754d0a23a9fb285da2181af2b4fca38aa5788",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html": [
+   "223f1866e9d9105627032ae793772569afd71bf4",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "c9009ba9bb480c1f5ca896db4e277663e6e0cd15",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html": [
+   "6c803c7652774c9f771a9d4a3983f26ccfed79c8",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "e10011d34f1c255e8dc1bba44421cbc394ec1c56",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html": [
+   "d25921963348bd1fff8da88134a80a168816a3f6",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "3a8045104ba6f925939ef7dc001be3b1b79e6e23",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html": [
+   "30a6824fb622799ad7673ba8a6f6d61e6ce55d26",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "7e4275cad39a8ffd4b786f7170e4f5242f805e01",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html": [
+   "2034b69168930ce141f02522d5070f6be3fc71f1",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "130958a292a093ff546e19c75c0b31b7e72eb6d2",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html": [
+   "dd8050cb07cf6a517e7ec003c5e9b2ad88e8f726",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "40606039bedef1fe8d51e73c3591c805d9542caa",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html": [
+   "ba8468ff86fab2ad05d340e5ac2720307a1b15cc",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "35fa4d4e120634793d85b490079c73d819d91b7c",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html": [
+   "40905ede8f74a24cdcc2310cd573a27f7b6bcb71",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "8bbdbcaf518e5768d1a5ab0122614e01b19fe355",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html": [
+   "566975302f7b500b6cdaccfe87810a064238de97",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "f765d8e5ed47caec82d4d7e8e73ea60447830ca8",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html": [
+   "b68c33991244b835f3e87c29be6132ae38838780",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "81abd80a316168a43017a6ced1704c3fa9737ab9",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html": [
+   "7949aae354d0cd64f0b696ed55f32ceef5a88722",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "dce1889cdafd54042b8bbe2ee8992ec69b235351",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html": [
+   "654c8d00c861a99b41258eed0ee8913ddf06178a",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "2d300936294a87e13aec983a5775cc6e5c2d9e3a",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html": [
+   "b9bfa6a5214c78aa837d3e90d278d4bdc968eb6c",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "7490ce2006c713de56b2901f993ad48465f081e3",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html": [
+   "d403af05d7583bc4693fc06338d451287aaad0ac",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "efa72adcc5987f23569853c8539146e856181d2c",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html": [
+   "87820e5812ec93a5ad7319edc9f69ca097b6f5e0",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "6c5960010bb00a6757733a52638d402c05e6acc5",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html": [
+   "f5dfb70043f6018fb33f710aa834e93dfa42ade8",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "c3f9f1540c819fe7fc7ef246f646e6607f555710",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html": [
+   "a9f0ac0a96744dc10f8cba17dac21d0fb01b8689",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "972258f7c091c7d4f9caefbab141851e47747b35",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html": [
+   "98ae2c0006f71deb54700b2f692db91017434071",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "a0b43f146fc6f953ea7236063d57f64a4644d9e7",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html": [
+   "8c4a715c277640cad882596d65b9bae527409727",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "e4b8632fdcd82b7ba4bb6478b661edba430a7b08",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html": [
+   "8c477e58e5ecefbebdd51d3ad0ff31c97fc51dd4",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "f01ce4e02899682af817b4493162e7d967b418fe",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html": [
+   "37d55ef305f9cc32f569e8c791efcb0c6e8ed6ec",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "f0d6a0fd05418ea243b3d310db3dec726cf01866",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html": [
+   "cf39ccd38ad17b7ce488771b0b767aa6a953abd3",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "669b174a081ddf8a9a343731ed95a3a0304af16e",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html": [
+   "f447202e3d51e083c36b6304a042d7533c448129",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "f62fcf98e4074ef6070dbddbdcddbed45915aa11",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html": [
+   "e83c17e2b87f3e5c092b5824308391f6d97abdcf",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "c6c6a1e4837c818e2deb39ab4dbae2656ad8102a",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html": [
+   "113be97571c3b7321153f6e3ebd4cd6ee73711f8",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "b74b0d48002ebe35526fdce593f4525d736618e6",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html": [
+   "c52b4f5535bb060ee4f11d5e02493bfb20724dc8",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "e18a7d6a716ed458b3be0773bb971171513d797a",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html": [
+   "3834bf371f23ab537d3c24910649d47e3bd2d4e1",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "792f0231e440f4ca26fe0382dab94bbb31e9d86c",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html": [
+   "02cf5abed0cb33ef826f6f0b9e1553ff2a9cec09",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "a3d13d7ef6b582c7d5c59807db2b5723ec81969a",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html": [
+   "ef022b72dfae2ba371291cdaecc39c43d6a6324d",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "e4dc43e104e21c1b31be2d75f1d59b16d55bbf7e",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html": [
+   "a79346508dc12e80e00f90e45cee8e1d5714f495",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "fcc9e44e29c3bb03cd026dd316c58fe74894f368",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html": [
+   "eeb927bfa6033bc565bec94666d0559ff72dfa1c",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "41d15b0fcde677c901a156c64013492373094f2c",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html": [
+   "1c0e791357fcf6869494d5ef2d0c681b864457ac",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html": [
-   "8f54379c868928a7880d49226ab03565e9746408",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html": [
+   "7b30449b1f96592cf86f671b30891c8b091ee317",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html": [
-   "fabac2224ef801303534c71343c2ce48926fccb0",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html": [
+   "a20e420662d9941b553ea6ebf45fe0e79bad319d",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "9635d1c76c6aeb0408015d5bdc3c63ebcc18300d",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html": [
+   "969f993927ad03aea9a8215703d719e6fa11ed9e",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "b825d86ed65e7aa4fb5f7631cc63fa18c70798b5",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html": [
+   "47f37f86f3a3d61ebaffd909d065dcca438b4030",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "a8231d341c6681e1378813040cf54d56bb17894f",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html": [
+   "77df78413f27e00a0695c3452c7df821bdd76aa4",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html": [
-   "ac410b0914267c2844a77dad9a23e46b3eca9ce9",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html": [
+   "af9cf983258b5c759fedba94b7b776bdf01340eb",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html": [
-   "53d238278673ae2a50331cf93fa3886f1d2c52a2",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html": [
+   "020c41e1773f22c79b2ed28b878c19a22377a201",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html": [
-   "35418f29644db9d575656de22c51c7d06309a181",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html": [
+   "bd169400464438b94b7cb0b99a221a96cee59f21",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html": [
-   "4d62a43436b8a5de893c3551fd9475eefbc146c4",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html": [
+   "ed74429ca15fd5ab81bd3be203805a2ca871f57d",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "ae89a6a0880ed3e835b9607555285c472d599aac",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html": [
+   "ebcc6bac5b99310ed3d7013cd9de9a0749f3c942",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "06c3b88fb1cf61423063208a8393720eb3a30bdc",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html": [
+   "cc8c6adb809820b970944e248d00ca46320b9fab",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "237a5f0f491134bd4144f67d2dba8098b381f4d5",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html": [
+   "1c1bb7697f0b2b700a916ac233cd7e7d6222fcc9",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "ed249742bfda996c31ee78498720021f586daf60",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html": [
+   "df62047bff0915d2dff5713b6e3c49c591939965",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "ec9ed5db2687a59f6adb2f76f6ac0c5ecfe96608",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html": [
+   "17a8d06b6d85883de8c0b8281c8641951d292532",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "545d5215b80a71b53ace5c2e8c6b974224d1f95e",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html": [
+   "85c37ed2762152149710ed148fa05597e6e02d34",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "0a8b8a98c183667eda8f515bc6b0b83678aebb55",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html": [
+   "4d8aedb40040d52a5db539047d4e6848a24cbf9e",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "a4efc8f4d6b5898f2bee1ed04c462d5798587b01",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html": [
+   "52b029e38f3e8f1de30f41b8b2cd213a4afb2a5e",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "5ff897669a4aa2933728d9d4347ca05de0723d9d",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html": [
+   "f9629af5961d1d948d19930aa6ec4f3623a9e0ed",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "51d8fd3ede2ac355c977f273055f31333e6e7e67",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html": [
+   "751470c0f1183e010603dc754399944737d6f6d0",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "bf13e92fa48c9a86934fd2b3077b5edb037302c4",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html": [
+   "5bfcfcf0c3991eec80ac3581af1413c7b9aae504",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "d1fddfb6a424464bf3fc032b050c8c9d9dacb4a2",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html": [
+   "df7902ed007510b1f958e17dcc25e5a2ad8faca7",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "cbdc2336adaa8f7825b7e8ca1e0412049a7c237b",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html": [
+   "aa3ae70aac1a9de88ebb0ec60b181f8a059fd9bc",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "8563ebfd9fe6bb629df2f48057c8bbbf4d09687f",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html": [
+   "7dcd6a27c5d13b9f90f2074fea897db680c604e0",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "6365a8bcf02aea26b97739bd0a139f86657fd253",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html": [
+   "900b0694a598506c6985b1a1fb68deec1fceba08",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "35002016c5ad9c9b62d740ee3ac99c9a4415ae87",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html": [
+   "733ccaa102d5eac3281b0d314737f70539133dd6",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "0f0d047fffaab0a5c33871a07c7cb684c8e2d4f4",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html": [
+   "32d9172e8075953fdcbde7696f32b9966f64577f",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "4c9cd6fdaa190c73ddcde3affc953ea41b9c432c",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html": [
+   "1d2c73a4feed949d59ba9ad7ca580bf6b487f024",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "d9787a4e6d5ec0cc67e6b3ef84400246e3608e7b",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html": [
+   "5bd5fc1da3c5036cd2c04c814a66001a2d5aba7e",
    "testharness"
   ],
-  "referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
    "support"
   ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "8a7ede0d2ddabaab705f9bc147e884fff273e98b",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html": [
+   "83ca559a9cf89a31925cb030e1a524fd18f869ad",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "a150b8ea76d0a10b7adb4ea5d5a4280e2afc2e2b",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
+   "support"
   ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "e1c0b2a5b5a470f20dcc0232d07be98f1e3d9dc4",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html": [
+   "5e988c33a2c84f1483ee393a225005959e152f36",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "8dc5fd5aa9a1a0d877f7efc474874386909fa5a5",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
+   "support"
   ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "f74e8d3cbd5cabffb9a9181ffa2db0a0dd5f35f6",
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html": [
+   "e3a7bf037231402b9ac085e795b44db3a2ffd734",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "71d010128640918729fb3bacb01a29b398e5236d",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html.headers": [
+   "4cff1d12f82e028f7f1e9616bfb539ffb75b1df1",
+   "support"
   ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "c5e42caa8bacf38f0bffff4bd21a125728b1c525",
+  "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html": [
+   "057180a979d20d361e63af85cf9213bed202a51c",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "1a5ad9592d5fd28fdbfd06bd2067e58b9c6b4fa7",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
   ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "0ada60ada7117218c2211447c60a525bf33f0ca7",
+  "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html": [
+   "3688dc22422961c36f76ad31affe52f006905fd5",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "1737905526006bffb455575ebfe0e8bec7167529",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
   ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "f967363820902b6413b1d531ba3eedc4b535771a",
+  "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html": [
+   "1ded06e4b4622a29eec8d4a2a24baa519e6d6136",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "d4306b793492c681087ecce7dc66609262f3b848",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
   ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "0b0ff184b64f00f320c265679b6946929826e726",
+  "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html": [
+   "06167dd942e859cdcf1ab0977d23b375f24f5468",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "414c8723ca10488c1a42fade46fd983ed5668180",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
   ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "ba53dcf3508ca479c3a425555c514a261256f4e3",
+  "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html": [
+   "a1dee152b5dbc2b0207c18682ba0c79d9c5562db",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "0525b3cd2ee7d33568980d660ad65bce6e54b940",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
   ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "60094d7f0abe1838bf39a4f720b77f0f94888a21",
+  "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html": [
+   "d774b21538ca1224385c6ac4b6d7fe200fcb899a",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "35b705119f71b528687537a3a4a011a1e2c5b257",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
   ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "d5908e7ba783dead9e1cb6d2ece29688574d4a96",
+  "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.keep-origin.http.html": [
+   "ea3dad3bf8f052351dc3e6af1aeb942c67dbc6c0",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "3be90e5d4ac1efe53fdc105190be8e3b7c2229b3",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.keep-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
   ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "d64247c64475a6107dace6ac486ccb70ed81c631",
+  "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.no-redirect.http.html": [
+   "ac35310f0ba4ec2b57403f3e91f95dc25b423e81",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "f9769b95f9f7a92f3030c1c971fb2e2571947ee3",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.no-redirect.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
   ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "7c9b8c83221ceb5e416b6a773d4a19d34fffad06",
+  "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.swap-origin.http.html": [
+   "f61aada87f6a504b6075eeac70e8df395d711d06",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "483a43cddb138648c2df46f4eb5ab6586c4b8333",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.swap-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
   ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "f27831c876c8aa33b2d56b6b39e5d7ab12c2fe43",
+  "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.keep-origin.http.html": [
+   "96a82aecc2390c434d7887b49804da17ec7a02ed",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "44042cd5008283236daf1483253fd8576c3c17f3",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.keep-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
   ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "2385c83cab9ab56b37f8f5ca2ce8fcfee6ccfe4e",
+  "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.no-redirect.http.html": [
+   "024dcdbb855d2cdc172fdb5a6c5e9c5e6ab9b41f",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "bfe81dde602b875d20403a5be9a34f3120f25dba",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.no-redirect.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
   ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "c4305ba0bc8b52694e6d09047cdc41a9be8dfda2",
+  "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.swap-origin.http.html": [
+   "107bd7812f4006f733830f1db8bcb53c50482140",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "7d89052f52f3d8408e8fb3df960974d6c04727e5",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.swap-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
   ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "738ef6b1996f8c28ca7c12c1f350e1c685440394",
+  "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.keep-origin.http.html": [
+   "60b9f6766d19c893d45108db7051529f5ebd165e",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "f34d5494e7db61d9f3399a55d46f1887eff5a89f",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.keep-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "7599f2ff24317f5f4f29cdf28684db78a1cc1553",
+  "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.no-redirect.http.html": [
+   "af995ca2eadacd69b2a826bfbb9897a23513c96b",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "3209281673b8ab56398d663cf91d6fd0b27764ec",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.no-redirect.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "e5d16e24a55b30cd4998f2aa7fde02bcede486ef",
+  "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.swap-origin.http.html": [
+   "60a98bedc8b9b379a7f283dc0a55f344f5cf2c18",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "8009f57b1ee263fc1fc06af5887eb3c216742bbd",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.swap-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "b702eef57fc14889dea16279430d29635cf1c078",
+  "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.keep-origin.http.html": [
+   "b12f577a879f9d561abcb6c6e7e4242bbcacfb2e",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "b97825de1e0cdb56da1510fd908528c1a553be8c",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.keep-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "5c73dd4d88d7ca39041b2bac62e1ec9ab0507258",
+  "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.no-redirect.http.html": [
+   "fa99e45193e635591f0db129fc2a22871982f42d",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "f2a25196f712cc72458b8df5a22878fe6aab7e88",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.no-redirect.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "79c61faa4175c79013ec81332d4916f69b9438a0",
+  "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.swap-origin.http.html": [
+   "d5834fb1a1d7aa3fe3e3e3e0e21b0d93449d6c3e",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "3c2117ec0223436fd7fb76000f83ffca1999159c",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.swap-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html": [
-   "aa9af02fe1e0e1877e0eb31e6bd6647fa3fe0ef7",
+  "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.keep-origin.http.html": [
+   "f10620601c4ba799745b0dbcc66e5bc54cfc2ca3",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html": [
-   "43f4147975566dc072fa4bb1a1b9f7ff24817826",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.keep-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "cd10ed2b6b59793d3d9af2c6c7d90653d4cf7532",
+  "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.no-redirect.http.html": [
+   "256d82897267b418188299398c490d557447180e",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "a1538cc41be67998c463f2f32b262fe78045c003",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.no-redirect.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "4fc2718a910c050e0e204d5b39f00e9b0b1dec0e",
+  "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.swap-origin.http.html": [
+   "582bca8a55d33a3a91c1aff5b1edf617f19aa9f1",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html": [
-   "2ffaea9826c621a31f380ffdd02b3a8526c4fd84",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.swap-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html": [
-   "c997e228e17497a2a993792c1398c5a34756a7bd",
+  "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.keep-origin.http.html": [
+   "0edd958eaa6bb5ad239876fa4df6cfe4d5c93033",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html": [
-   "2872d59fc514fee21801b670ba49f1ecbfbeae03",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.keep-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html": [
-   "dc7222d37329499858241f58fd3e9a12f656403e",
+  "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.no-redirect.http.html": [
+   "f4225e0e34d838e4d671cc9bf373eef29c3f649e",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "a2c953d6e74d7b2b5f7638fe3eb92a13162ef0e9",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.no-redirect.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "2bf98b8211904e826060157c789f9f78dfe8d5f9",
+  "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.swap-origin.http.html": [
+   "e71abffe43007d69e5674bdb4b9b08f7c92e3904",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "0af634a6d27ab6806d3a112646383317ae2e3478",
-   "testharness"
+  "referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.swap-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "f3608e17eb9e9b4e00e97af35ecb5a2d27b8a68e",
+  "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html": [
+   "fcfb36be0782b1832cb51045f508f6788164d7fb",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "57d8f47d4f2e209aed09cdfd190e16f3f4dc3545",
+  "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html": [
+   "c5f506163b0cee181e8f188a1b59b56acb426c5a",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "47870a7628e68b29653fcad2826a4a4e1f9e2366",
+  "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html": [
+   "e42ec7f173cca267da82d8c62b63eca194ea5104",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "3d1253229e3ce2a12c25e9a6bfd0ea8c32b4a960",
+  "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html": [
+   "bc459e949d269a16c92a13ef474105d54aa6c679",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "8c0a1ec4eb7e1d4e73cc9248b3a5295c6aee2320",
+  "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html": [
+   "35179b3793e3e109db1c65e8f4d004bc44e6a617",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "eaf45d6f7a56b805933575a89796fbaee236a10b",
+  "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html": [
+   "6657261925bab5d47d867091aa9baab55895cbc4",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "9eaefdaf1ecb6a95d61a5d09b04813b1b4f10209",
+  "referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html": [
+   "1256c4229cb72422aea4e0375862e2a4a8995132",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "bde05c454fdc270c6c58b9b26d61c96dd12f08cb",
+  "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html": [
+   "7976130fb94e4bd1d3c1cd38cb6ac83085ba2b67",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "7d723ab86a122870119fc6e46fbe8d6d64a1992d",
+  "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html": [
+   "46fcbefebcb28c01d98b26974cb735925ede1bb2",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "e04b8253413a606b5913c532ac9c3934188310cf",
+  "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html": [
+   "214285a9cc70e81fdab86b621813e8a85ae1e093",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "413e8ad82a1eefc6fd671a02db9ee4e52d872552",
+  "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html": [
+   "861d55102675f26f9e9e8ef248dd09bf0a7daf48",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "2832c088422ab0fc6154f4ef695698f0e879c948",
+  "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html": [
+   "caff7fe9313ae1ed1b93e0631800df7592cd2455",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "78773bd5e7142ff4390bd686aec6cd21755246f6",
+  "referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.keep-origin.http.html": [
+   "c050bef9faca254b6ce66f669026dfc6edb64ae9",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "3cd75589c30396db88d29dc11cb5abfe0ec7e43c",
+  "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.keep-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.no-redirect.http.html": [
+   "7e9c5c2058250f2d4162d13d42572288ac11719d",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "cbccc42abdaa5a33189e9aa071e252e033f0a230",
+  "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.no-redirect.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.swap-origin.http.html": [
+   "949d6267406a33f951415277efd64f325769f3a6",
    "testharness"
   ],
-  "referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "ccd15b3bbfca4b0aae2817432949a042d535c599",
+  "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.swap-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.keep-origin.http.html": [
+   "9544b914dda39deb973afa25e3e6143c406077c9",
    "testharness"
   ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
-   "7bcc2189a06b278e172ef18e25f2eb77a9080976",
+  "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.keep-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.no-redirect.http.html": [
+   "12a3345a651067dd642429657a7e95d82885d1e5",
    "testharness"
   ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "052a9df8e718bc7f5b1a536b542afeb9e77d2d1f",
+  "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.no-redirect.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.swap-origin.http.html": [
+   "da5ec0b4fcc3819bdf1527d5cf74462d3e833789",
    "testharness"
   ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html": [
-   "92b1559f77a34faf3d2e27c3dbc9139bf6ac7594",
+  "referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.swap-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.keep-origin.http.html": [
+   "8f52a22b3c242343731fcf14732170b679e04f2e",
    "testharness"
   ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "c047ae9b3d2391726700ede6082f3290ede16268",
+  "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.keep-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.no-redirect.http.html": [
+   "c9c71a76d6b1988daeb0d6f2ffbc4ca9d24728ae",
    "testharness"
   ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "a1e4d2d8adcdf6ce31d723674acb59768c59b6b1",
+  "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.no-redirect.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.swap-origin.http.html": [
+   "d6c7639e7d1061a42b69ac546697cf3cbd2226c9",
    "testharness"
   ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
-   "7a1fd76a93063b164e697d47a35d20c624d748bf",
+  "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.swap-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.keep-origin.http.html": [
+   "0252877d323d1ca29a1d796c0048846b509a15d6",
    "testharness"
   ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "9b7cf05f66e8942ea379a7bd1af05708db5ac555",
+  "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.keep-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.no-redirect.http.html": [
+   "a17949475324a0d17341409caa2fb63418d60149",
    "testharness"
   ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "6c6bf43a24da351d73249c4938cf1022a3f058b6",
+  "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.no-redirect.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.swap-origin.http.html": [
+   "b88a6e8267fa44effde7dc4c37d10e58032bd9ac",
    "testharness"
   ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html": [
-   "adbecffb5055ad8b9601fb43131ff2ca18c3c41f",
+  "referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.swap-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.keep-origin.http.html": [
+   "0164b064debca7bf1b46f114824229418c78298e",
    "testharness"
   ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "a0942713fda3f86974fed9cfb2e0ae32f985b0eb",
+  "referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.keep-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.no-redirect.http.html": [
+   "289fc670546fc19b5718e4c9177ab1bc4c09fddc",
    "testharness"
   ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
-   "b37889b65b81ba6c2f236eab1f7a52764111298f",
+  "referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.no-redirect.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html": [
+   "7561b4a088241bd2e91e1294691885e6956735b4",
    "testharness"
   ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "dad6e7ec9af0b8026a449559e4eb102f030d7afb",
+  "referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html": [
+   "2244a4cab6f1b0d2c5c7fce4ea21f6036b9936e2",
    "testharness"
   ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html": [
-   "0e379e4312314b6ac9033b6077f3d8bbc92a6c04",
+  "referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html": [
+   "4fa1f76fc9c7935bb079f1cc76903de1e1338c3c",
    "testharness"
   ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "1f7a8985a9eaf9c63aefbc1a94eb77692dc33af7",
+  "referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html": [
+   "f1f946f6df1318fe48edd0508b6ff25910f722b2",
    "testharness"
   ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "2cbb6fd3489a6fb1610d396d1cd84b6cd39b5e3c",
+  "referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.keep-origin.http.html": [
+   "62b1d9fcfff140aa81af881c685225c7fa290076",
    "testharness"
   ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
-   "289aa3faacd62c4a5b7664224f239a77ea217852",
+  "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.keep-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.no-redirect.http.html": [
+   "70fb9f9b1a2c152d57d263177ffd99948587dd99",
    "testharness"
   ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "eaa417eca087df663bd992d9fa5681f3c725ecb1",
+  "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.no-redirect.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.swap-origin.http.html": [
+   "7fa069a3df4ffc7b57a4a30779ba80138bdd083c",
    "testharness"
   ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "2d2c6d6d04bb77176f33a658f02d83931181bc1f",
+  "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.swap-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.keep-origin.http.html": [
+   "443e5e99ebd82c754c73d853b236664415efc073",
    "testharness"
   ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html": [
-   "7e99eba7a8c0de14a5319861eb19e4bf051e5ff0",
+  "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.keep-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.no-redirect.http.html": [
+   "946ef6f0d6e55b4cf0200976a70651058248bf36",
    "testharness"
   ],
-  "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "a294cba7c53bd8b21f22bcf72265ca21735e652e",
+  "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.no-redirect.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.swap-origin.http.html": [
+   "24165be327592733572e6dc6d0bc99c641cbdb56",
    "testharness"
   ],
-  "referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
-   "0f0f3f586c7061c81392fdbfbb0614a9a564c7d9",
+  "referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.swap-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.keep-origin.http.html": [
+   "46f49d813cc74c896f729be42da32b9c005e15de",
    "testharness"
   ],
-  "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "29598521aae474ad8e0249e77f8c5ef35e122954",
+  "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.keep-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.no-redirect.http.html": [
+   "5d6ae0ab3a61b379eb184111b8dda579051508f2",
    "testharness"
   ],
-  "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html": [
-   "03618c360eb2ea6a16bdd000f81352ac06f4f8df",
+  "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.no-redirect.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.swap-origin.http.html": [
+   "c0f820760219b1afe18214e0906d2f11f31a0f59",
    "testharness"
   ],
-  "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "1e785d961ab5f83fa3cdaf6bb1d8096599e4c848",
+  "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.swap-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.keep-origin.http.html": [
+   "ac0c3e71bbf2f205cff785c54e7499f28c7fa899",
    "testharness"
   ],
-  "referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "4e046873b80698f0686963ffd19a4a5df3063677",
+  "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.keep-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.no-redirect.http.html": [
+   "83ad4b6291261e2f4f7386a9d0e2b936a0844522",
    "testharness"
   ],
-  "referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
-   "c61e82351abae662c02d9f815581ef965395de0b",
+  "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.no-redirect.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.swap-origin.http.html": [
+   "92157004fac32b0135b4cea4c6a9f7bec2674747",
    "testharness"
   ],
-  "referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "96fc319aeeb771d19f522f2056cc07424fa0de56",
+  "referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.swap-origin.http.html.headers": [
+   "1c32fba5a1e23d2800e6a00311cd58e8b70ec130",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html": [
+   "46f755716fbbe8abe1eafb384de782154f034f0f",
    "testharness"
   ],
-  "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "1e54e3910e47c0519b5d9300187ca6bfeebe42e2",
+  "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html": [
+   "ea92aa8bb903fd8a08bdb2a13321fde5a089c9e2",
    "testharness"
   ],
-  "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html": [
-   "a67da15008442cdfdddc04b50b85fa45eda5ee2d",
+  "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html": [
+   "81b93dbc33565034b4588fcea887cd96ca6552e1",
    "testharness"
   ],
-  "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "b5c0081ef670b30fab9000c250f5747155867d4a",
+  "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html": [
+   "8f83d836372e744d20890ab1681f4f741fd55b37",
    "testharness"
   ],
-  "referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "9aeeff94ea29d6e9e3f4831f2e5ed2dd5b31cb05",
+  "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html": [
+   "652544ef076195e5c728560dd206d8367b9142c6",
    "testharness"
   ],
-  "referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "0b75d68887554411a66fd7a729fac2a6fbc34b20",
+  "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html": [
+   "501473cb7d16df2f922c2fec982bf52ff58f0e37",
    "testharness"
   ],
-  "referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "2be11cbd75b1c632d25aef91215d435d53a775a6",
+  "referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html": [
+   "a4ab8302d9a3031740dd79f1b80854003bc62a56",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
-   "5923bd66f218c216f82ec0c8686e4063d6dee687",
+  "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
+   "support"
+  ],
+  "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html": [
+   "f4446f7c759319a8310126a7f87812476aa83998",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html": [
-   "cca4a0ceb6e239d7cd3e2d7954d3753a8d519ec7",
+  "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html": [
+   "32f80b9210ec7cfbd053c3a9a17cd218015bb3eb",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html": [
-   "8bf793b5b86006bed7f85160039315c922e11883",
+  "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html": [
+   "ff6aafe80dc284585466681530644825b3dd5752",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html": [
-   "7c0a9b9bc6068ba1366b4ece8f691ac85b472852",
+  "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html": [
+   "5b4309f61bc1a0257189a63940d4c9123c5a659a",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "9c2b85af9b33c526f7ef12e6fc73085f544e708a",
+  "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html": [
+   "dbf8920ceb0078725000c95320af9297c6d90dd5",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html": [
-   "96bc005ebf9ff3e96427c6f963c64abc2fd04942",
+  "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.keep-origin.http.html": [
+   "e184f2f99d02617291a8c2d440eb1938d2b04861",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.keep-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "4e35615bf1b6952b9141491d2dbe4da721644416",
+  "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.no-redirect.http.html": [
+   "e713b614473b202e0444b2a8a6af0f0a1f216b27",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.no-redirect.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "b78a720df6887c563b3188bfb4388efab3cb6d06",
+  "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.swap-origin.http.html": [
+   "efcacb80db58462ab3291be1f8bdde1cc4cdacdc",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.swap-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
-   "7d5905ba238960efdbaa054d3051b2ba8dbb801b",
+  "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.keep-origin.http.html": [
+   "0e0ad8762584cb5cf490949d858fc642d3a79eb0",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.keep-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "5a8e1fd812c811fdcad799c061edee418e4f4c22",
+  "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.no-redirect.http.html": [
+   "7aa58b40dd9d99a758da491d177c4c57880b1204",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.no-redirect.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "f4a53c631d569bb8ff9cd19e76734fb0dd0d6dc5",
+  "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.swap-origin.http.html": [
+   "96940d924c513af36572212c85568888ed7c5d27",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.swap-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html": [
-   "d6b14df479501a13286d725e8c2527d6438161c9",
+  "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.keep-origin.http.html": [
+   "826f0129e497f916ff8fb4ed62ee4ad49f6cea5b",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.keep-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "b5daa974365c947fdf7570cb5213acb3b8026e4d",
+  "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.no-redirect.http.html": [
+   "ff42df4b3c1e886ff76b6eebdad145caef406d3e",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.no-redirect.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html": [
-   "7fdc05de8d66e4a922be27882866f898bfaa8242",
+  "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.swap-origin.http.html": [
+   "abd462ee755b5752e21a1c61101d0952a31599cf",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.swap-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html": [
-   "c5b705bef4b911a755e57895387973ea94a83834",
+  "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.keep-origin.http.html": [
+   "141ccdb31ae083a244a22ddcb3a75024f03e20a4",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.keep-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html": [
-   "926ed948d513198bbfaa4566f138608def79ea12",
+  "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.no-redirect.http.html": [
+   "b322ae35886009dc743cff902620522f4814c0c6",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.no-redirect.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
-   "0bb7ff22833d0673710f999f25f1900524bdb938",
+  "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.swap-origin.http.html": [
+   "1cafbbc10b4f952cd1b948ac3f90019c53ee38e2",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.swap-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html": [
-   "b1d5c24fdadaf54f4271387436ab4b928598964f",
+  "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html": [
+   "d8beb3587aded8df07c1a2140795392f7178848c",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html": [
-   "29efe5be1eb4df6ce64d5bb581c5d12a69e0d6b9",
+  "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html": [
+   "d70214a0bbc31780d69fa35ca016c938728de45c",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html": [
-   "79b406bb6ef98946c2464a17fc5c5e53d763d5ef",
+  "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html": [
+   "8f93cee247226f5fbc592171fcbc830a014da52c",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "553334e038b15e87bb3695105ed781df416b40a6",
+  "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html": [
+   "fe438d62a8b8dd39d617caaada0968488b890ed2",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html": [
-   "c23a6cdf19891d86c0737d79e2615ade91828170",
+  "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html": [
+   "aa3d84b0d724ed45cd3869ab15e658b1cd1a4c5e",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "7dbb28b150ef87904030e004b7f29cbb95abb686",
+  "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html": [
+   "5b7a08d20b0fd84f84c0e73c39b66986c3f7667f",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "0f8c2d41b9adb19b22c94891c6a94ca650485a6e",
+  "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html": [
+   "aedc3236108a76de12dafbf54fa0f3e5309dd2dd",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
-   "85236c6263d051ea673de4a8707ae55f930817d3",
+  "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html": [
+   "ec1ff22f3be5e11c3872b52c73d2b26b2cc32f89",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "26767fab0b35cc69088350e4361791521b1b495b",
+  "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html": [
+   "632a02bf290355919349044782402157e451f77d",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "2c98ba5babf4afdf68e5504520aa4c1735ea8ba9",
+  "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html": [
+   "16ae57857d5a49a41c7d53a74e575df41b64de30",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html": [
-   "3a4e85ec7e6ecd582a1426d11cb82ad407b76963",
+  "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html": [
+   "10b36291cf7653e19de4d495c88ac6e5a5ad2e08",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "7b0b455205756aa3b465687a5ecf3008fa62fa5f",
+  "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html": [
+   "4b3b746577ee29dd62a37e0edce8543a6cf8796a",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html": [
-   "274f04abe69076599818e8bc01303576a74c87bc",
+  "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.keep-origin.http.html": [
+   "ae46fd10a2878947ee068ae21dbbc8de650a99c3",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.keep-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html": [
-   "dc7dfebee0676cffcdc3b84d74bc9214eb58d247",
+  "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.no-redirect.http.html": [
+   "cceae990937075a35dd0f5584856c8eebb9f3187",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.no-redirect.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html": [
-   "b2d25b69e3069ef9a4ae29430d06c99157606c7b",
+  "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.swap-origin.http.html": [
+   "9730c086bb411cca9f8837cd83fa13099da50db7",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.swap-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
-   "86ad248198ca36421a965986090a3eb47f15a1fd",
+  "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.keep-origin.http.html": [
+   "edb2870fd2a555d092e756c2549bb7b212241a96",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.keep-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "622f77bde2d799a23c99d41615c7b932a163b57a",
+  "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.no-redirect.http.html": [
+   "85bcee0592415e6ed0be5a3eb67e0770896841d4",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.no-redirect.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html": [
-   "dab704a425dbf18c4bc7a5c45668887f4bd3fa34",
+  "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.swap-origin.http.html": [
+   "cbe536dad6b3b32dfe4c0df209d1b40a7a3cf783",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.swap-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "878d948ceb3d0a2decd663a5da49d03751c1d6be",
+  "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.keep-origin.http.html": [
+   "f0020630ccb223e184e81cc057b9da28d2253dc9",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.keep-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "603ecc5577953c60dca3e4151737868c9b7eba13",
+  "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.no-redirect.http.html": [
+   "632083161f0b30cdfc9d74369df3c1d7232d8b82",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.no-redirect.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html": [
-   "43a132e68087bd38bc09b35b1d135064fcc590d7",
+  "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.swap-origin.http.html": [
+   "857b3cc3b11780ad6a260bb4795aa57c11570e31",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.swap-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "1bd76067b274b0cc8e0bd7a8e7bace26ebe645cc",
+  "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.keep-origin.http.html": [
+   "27a0f12923707b3b19a04dbbd1181c1e46c14440",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.keep-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "d00194b14373fddf919b705e8f368a21c7251355",
+  "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.no-redirect.http.html": [
+   "bb7bd17c07624ae7fd99bf77ae65960619891b4b",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.no-redirect.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
-   "2daad6708671e79dd0d13afd5ff82fd96a55e8ab",
+  "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.swap-origin.http.html": [
+   "3e38bae9f2bf0f1293f47c394f8e95aba0ab0eac",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.swap-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "1cda061aa01ea3346583e87fdc1d4ee7d1a04512",
+  "referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html": [
+   "4783f45ac9df5065f36ca61fa5933e79f17cec67",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html": [
-   "735a4acbdf653c4ac67dfe2ad4fc5880719f45ba",
+  "referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html": [
+   "f2f186cdfda91a00f14e3a564047ce6cf0e45b44",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html": [
-   "19e5416cb3fb454a564da05e0cb319a2e784349e",
+  "referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html": [
+   "08a9996882fbedcbcd9b4b8f5c48cfd72fc622fa",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "e45cbc673aef1a9547b28ba239218a1d742656a7",
+  "referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html": [
+   "4230c620d52664df2494f74ebf2efa939ab1eeb3",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html": [
-   "4539d076c498b5c2a385d60d2af98fd605d75d80",
+  "referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html": [
+   "94f6837bc9dca4d5439f12f4839fb33e486fdae9",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "7f3e435f11a75749272ee2e89bef15edc5b6119a",
+  "referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html": [
+   "3c533839f64b6b707c01d6e1485422211066d2fa",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html": [
-   "81607785f9aecee0c333472d6e5ebcdef4cee98f",
+  "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html": [
+   "b97e5c6999140d5ba25d63c2e69d0a5251b9b235",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html": [
-   "a8a6aa1d8284cfaca4adddee4eb33db1b4dc0a8f",
+  "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html": [
+   "3de9921101b1c4d500d27fc24978d79cba10be97",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "f1eba7aacdc8b8a3d3d15a7e49f8dbddba81136c",
+  "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html": [
+   "4a927af2bb0e50790bf658bf54753ab3a6907aa8",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html": [
-   "7ab0933178534647189dad28aed2b0ae1e59e304",
+  "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html": [
+   "c90180a3a07dd0264ff84421b728295666794ce4",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "29ba286e378d9520e58b8f457ef792f1415edaa9",
+  "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html": [
+   "6c5cd5d0323b881e4aedf1d35bee02e82b42f36b",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html": [
-   "0d1b267039a1275bbd030fd83409c3ee4dc56246",
+  "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html": [
+   "433913e65b10b58ecd131174fd844f088e47933c",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "dd07624a9990c8ee9a6bd51805fe3c3956dd087f",
+  "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html": [
+   "82d546f303054b873f782f46fff45976e64477e5",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "38df795e3a527273e8dd842a430bfe6f6a2fc797",
+  "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html": [
+   "76dfb9bcc00e473494401539f5317aafd948c966",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "525df39fd4b9d10cc94602f39458bbe5447a10f8",
+  "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html": [
+   "cd9a26e1a25770932673091e54f75043742facac",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "a4533c649aebba3bedbfaea508e8db106e2be24e",
+  "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html": [
+   "8a345aab4f522a7a93b97567fe91a963adc04f18",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "037bb3fee4621ec2560464927938994a067ab1f9",
+  "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html": [
+   "770b6be72abdbb4767d4cced8409974bddf481c5",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "7671fa5c539724e4b3f062ff2d09c68fb692bf8b",
+  "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html": [
+   "557c897f6dcf731b9dcb6f6df25096a4ff67f73c",
    "testharness"
   ],
-  "referrer-policy/same-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
+  "referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html.headers": [
+   "c1d3fd1a0be2609a6939653a3f4ce6f5036b6286",
    "support"
   ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
-   "ed415758d0660d20a35d45453241c50539c3f95a",
+  "referrer-policy/gen/top.http-rp/unset/fetch/cross-http.keep-origin.http.html": [
+   "ea2e8d1194859594c01f573e3f3ce5818566a9cf",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html": [
-   "085a267a574315c3ef79201716645cce9e05e446",
+  "referrer-policy/gen/top.http-rp/unset/fetch/cross-http.no-redirect.http.html": [
+   "2cfe2a0fb99b9b83770be5ea0347887437cab561",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html": [
-   "cc554724b309b41326ade1d96358ef07aab875bc",
+  "referrer-policy/gen/top.http-rp/unset/fetch/cross-http.swap-origin.http.html": [
+   "44501a5f736380a6c6a3e879bddfbf8aa6f4f90f",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html": [
-   "011ffcd01eb6882a4c2ef216bc76d921fc01b164",
+  "referrer-policy/gen/top.http-rp/unset/fetch/cross-https.keep-origin.http.html": [
+   "9f51a70045663262f724914650eeb93b92551a7d",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "3f7d38759e9164c4702b3315fda85c6bee66fa37",
+  "referrer-policy/gen/top.http-rp/unset/fetch/cross-https.no-redirect.http.html": [
+   "b16692f66d4ad8094cff6c778242afaf819cedc5",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html": [
-   "f66e36d7a9b2ed7dfc98bf305265296c0b54ea0e",
+  "referrer-policy/gen/top.http-rp/unset/fetch/cross-https.swap-origin.http.html": [
+   "532809dd0afa8fa7cf20e93572ffe3068482a768",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "e10c1066d6407de1e28dc2b7ec974f348ca2021d",
+  "referrer-policy/gen/top.http-rp/unset/fetch/same-http.keep-origin.http.html": [
+   "99882a623ccd727407e4fadb666994f615afb93b",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "b3424b1ea90df159ac4357acdf1912aa7836db10",
+  "referrer-policy/gen/top.http-rp/unset/fetch/same-http.no-redirect.http.html": [
+   "aae08809fa202d2d0dafd7fb8b11802f56b14dab",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
-   "40c2b7a9ff80538e4597efcfe68206419d4550cf",
+  "referrer-policy/gen/top.http-rp/unset/fetch/same-http.swap-origin.http.html": [
+   "b8dbbd6e029ff40110d6d30bfd013201edea9b6f",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "13b9d94f53e651983f0c98f1368712ac686f8b94",
+  "referrer-policy/gen/top.http-rp/unset/fetch/same-https.keep-origin.http.html": [
+   "5480d46ff3f05aa804e2386c755d0afe3fd2ee49",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "e50f65e16b9ffd7cecf8e9e1046a39cee5d44641",
+  "referrer-policy/gen/top.http-rp/unset/fetch/same-https.no-redirect.http.html": [
+   "0edaa41c1c8237df53d6c4e2cfe3654aa0b36d2b",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html": [
-   "5b5dd12e5968a6e331c92b17560907ede8af86d6",
+  "referrer-policy/gen/top.http-rp/unset/fetch/same-https.swap-origin.http.html": [
+   "2bcb3cbe6ec3e8f8102f8a5eb4e4a92e53f91476",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "ebc18c61cdcd34e600f6bacacc7ef5b664e447e7",
+  "referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.keep-origin.http.html": [
+   "97ec687004a41a5aeb3d8d7d06c3a3e5a36db20b",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html": [
-   "06becc108f4242a8a65c29e7ea96834c2fb335f2",
+  "referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.no-redirect.http.html": [
+   "d631a6dcb12fcdac7bd6cac94b67893203ae805c",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html": [
-   "88a7cddb0b0b45d0b9be0b76eef78920142bc69b",
+  "referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.swap-origin.http.html": [
+   "2d627c6d22edd82ba71e776c85cd7ff9981f6db0",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html": [
-   "ebd682842212eb437f3528ea9797fe4169b8e9ea",
+  "referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.keep-origin.http.html": [
+   "366e8665a62e062ad5d44f079d0585d353a38d9b",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
-   "b50c0b60db869878263019cd538f40b5c91be652",
+  "referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.no-redirect.http.html": [
+   "3a55660c0e48d19afd0101e29b9b7b09013ba7b4",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html": [
-   "df69d477669de463a732771d42ac960b23cee88d",
+  "referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.swap-origin.http.html": [
+   "9b857831f09986428eea878ff03d33981788d4bb",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html": [
-   "eda910d09224a34fd6691ad8d237aa776a0030d6",
+  "referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.keep-origin.http.html": [
+   "d80ff5a58075f7a0cd469da0d9ec0587172316cb",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html": [
-   "37370379123733391ab56ab9ef5f17a7a906cb4a",
+  "referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.no-redirect.http.html": [
+   "012d095ef49377e0c7bf2ebc6e12efd8aed5dec4",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "56e124b14703bf29e5939802eeabb40efebb92d5",
+  "referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.swap-origin.http.html": [
+   "f2f4595415a3c912da6fab0b144373651393c91f",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html": [
-   "2d1110639e0fbe8c391a9d8d7b98cbf1ce1fc8db",
+  "referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.keep-origin.http.html": [
+   "667567ebba11259e988613adc3a040269a927abd",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "22fe64a09450148c529ffad93387de46e86c2e41",
+  "referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.no-redirect.http.html": [
+   "2824cead304141079f73bedaf9655ed5406d34c2",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "2ae690c53d97c27f587fd4c7a2fc3fe959865e97",
+  "referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.swap-origin.http.html": [
+   "9efcc95c2aa98335f7613d6d2e53c2550defe471",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
-   "b14908a7b2cb7fc4271cbe54566f074053e84ea0",
+  "referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.keep-origin.http.html": [
+   "3d9206f18f101b20ceed0fa677ac5836b1db9c30",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "485c8784c699bc4b8c93cb38a818965b1ff0e1e4",
+  "referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.no-redirect.http.html": [
+   "6d5c1e56cb2cd0842d8ee456ce73b707edf196af",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "f81dd12dc60735340ffebbbe952929e48d9e6c0e",
+  "referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.swap-origin.http.html": [
+   "51596668d9399022071858d762337a0eafb9ddab",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html": [
-   "484d9ec036ff84737e8426fe3281c1c8a4f0fc29",
+  "referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.keep-origin.http.html": [
+   "9cd2d1ffee576cf75f0fe9481a5f8697df675b7f",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "e566233091f45603c48235541df2ba68233998f4",
+  "referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.no-redirect.http.html": [
+   "4d71131d9b94a23961efa78f075787d7cdd0f432",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html": [
-   "f68dac93582cd5e7d1815d6c367662a84a2cab03",
+  "referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.swap-origin.http.html": [
+   "29a55b7627240b528710a4393bef43f131a676d1",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html": [
-   "7ffc2824a8b83c7d0cdb99ba27e0d550e465d454",
+  "referrer-policy/gen/top.http-rp/unset/img-tag/same-http.keep-origin.http.html": [
+   "09f9e964f66baabe323a038841b971e35119468c",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html": [
-   "0834f026a39a6c328cb65a9e603d30196db8910f",
+  "referrer-policy/gen/top.http-rp/unset/img-tag/same-http.no-redirect.http.html": [
+   "ee69797376a02ae0c6d090dbbe516fb40048c482",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
-   "6f2de0eeff1a23b74ddc877eb405ffc125b62220",
+  "referrer-policy/gen/top.http-rp/unset/img-tag/same-http.swap-origin.http.html": [
+   "8b9f2909c649220a721ff71037e9c27bc6216805",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "51d538a7502de1f86c24d73b7c822929fe130e15",
+  "referrer-policy/gen/top.http-rp/unset/img-tag/same-https.keep-origin.http.html": [
+   "63ae656a1bc084f439d34a979f7f161d6c26cd7a",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html": [
-   "09e9945924b2c45fdf8d605673360e97a9634c44",
+  "referrer-policy/gen/top.http-rp/unset/img-tag/same-https.no-redirect.http.html": [
+   "63a3adfeee104f91c678d9ba8ce84ea5486b2117",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "ebd39b1026f2ab3d19ca43af7012aa0ecbb9fa49",
+  "referrer-policy/gen/top.http-rp/unset/img-tag/same-https.swap-origin.http.html": [
+   "bf559ef2fa1d63406597c09ed5fbd3b21847c613",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "3cefbeb1b7d46788c7b6a5672a15c7835563724b",
+  "referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.keep-origin.http.html": [
+   "e49bb460dbab8b926c3eee0e8e6e0040c6fec870",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html": [
-   "1f883558c63dea7fe033a8c1b8a356a732d40aeb",
+  "referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.no-redirect.http.html": [
+   "cc431565cb16ac0042be8eb61b37c02c901b2314",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "d705e0ad3247fac9ef208f64a9941daef6414fe2",
+  "referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.swap-origin.http.html": [
+   "acba24bf6482e9208b25e9fdfedd9d908f00002d",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "f6a28d48c1c87bada3f91f60d64d46b5874ef751",
+  "referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.keep-origin.http.html": [
+   "6d335a915c88ebfd502e7a7edec108468ef52ba0",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
-   "a38fcd1affaa899d1df49f5fef443ac3679a04af",
+  "referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.no-redirect.http.html": [
+   "a72d9f9d555eb60ee0e7ebbc9fab32a1d3230fe3",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "9ac2ca34857a77a6729ccb2aae308e72c339deae",
+  "referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.swap-origin.http.html": [
+   "5ae41b8a4757fccb99c9cb44059b34cfc4370da4",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html": [
-   "1dc4c4cd4d1434d9c926697e7b79c8c02759b0fe",
+  "referrer-policy/gen/top.http-rp/unset/script-tag/same-http.keep-origin.http.html": [
+   "41d2ffbf3bb9f94ddba57b8f91ff4b6937797ac7",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html": [
-   "1c28100003e25ce97c9adad060a51daf895ebebe",
+  "referrer-policy/gen/top.http-rp/unset/script-tag/same-http.no-redirect.http.html": [
+   "c50346186988fd0f38d4c858493c667d658f06bf",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "8abb5198b865f5e37d740b3c309db0b908351fc5",
+  "referrer-policy/gen/top.http-rp/unset/script-tag/same-http.swap-origin.http.html": [
+   "ccf74bfc9783b89ef645e64dd6b433f2976e4ef4",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html": [
-   "9d4630b46c5fbbd68e400010f3df300e4ae770d4",
+  "referrer-policy/gen/top.http-rp/unset/script-tag/same-https.keep-origin.http.html": [
+   "1f3c30737f984e230f66b8951b1efc83602180db",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "58e0f26e2f8c208b6dbd1f2ca7f0b67185a1d98e",
+  "referrer-policy/gen/top.http-rp/unset/script-tag/same-https.no-redirect.http.html": [
+   "8b7f117bd904e95890d417f6dd772dcba17b956b",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html": [
-   "f47b1f3704618292d0a7af17a2a09983bd1dd474",
+  "referrer-policy/gen/top.http-rp/unset/script-tag/same-https.swap-origin.http.html": [
+   "de7ff149fad8eb3705adfd9d32af4066563bc9e6",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html": [
-   "b45744a94ea9e6d78b225895ad04a572269e4458",
+  "referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.keep-origin.http.html": [
+   "bf5fbd15347c0589d84cf150d64da32e551b9d6c",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "d2061267c24a87e75a1a19c055b9c4dbacd8d77c",
+  "referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.no-redirect.http.html": [
+   "019f99b85150aa1da20a9bffefe9fa81338be86d",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html": [
-   "5f35a68ef064b99f3daee011e185569cb0ee241a",
+  "referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.keep-origin.http.html": [
+   "bb03d60a754c84ee3ec4f530ebc1e2af7230dd08",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "e9787edaecc454615bf1c065a579626b67e58897",
+  "referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.no-redirect.http.html": [
+   "2647d9c0068ca57d5070a0d503748e4d391a7e9b",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html": [
-   "e00a911d55a3d90215651ee693da2e80b18a2e4e",
+  "referrer-policy/gen/top.http-rp/unset/worker-module/same-http.keep-origin.http.html": [
+   "48e9b2fc797ce1bedab11017c450b4bcdc3b7075",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "699e73a837f9ec7d1dff1ace650456c9c845efe7",
+  "referrer-policy/gen/top.http-rp/unset/worker-module/same-http.no-redirect.http.html": [
+   "c471a2ab65f0027b09a1156a7f9fcba6429c8fac",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "fd369ed2ec5f2da36453ab3b9bd39e2695fc43d0",
+  "referrer-policy/gen/top.http-rp/unset/xhr/cross-http.keep-origin.http.html": [
+   "d05cf044d6b27de6fb4b98e67aef5b4ce547298d",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "426a91f7370a55f1fab13d8fb2d2e3c3c0f6ff97",
+  "referrer-policy/gen/top.http-rp/unset/xhr/cross-http.no-redirect.http.html": [
+   "a46b1806e1d9c4db2f95f0fa58b2b8dad6dd1a62",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "f0d6cdbf00c720d54d10495703455a1efccb3e1f",
+  "referrer-policy/gen/top.http-rp/unset/xhr/cross-http.swap-origin.http.html": [
+   "bb3472038d3c63f0eecb5edfbc8f524a812c11d1",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "18250c8c3d9c110c24d0614008973132d01844c5",
+  "referrer-policy/gen/top.http-rp/unset/xhr/cross-https.keep-origin.http.html": [
+   "d7ff137270e823c1a2f2cea7a12bee20beb2ecc9",
    "testharness"
   ],
-  "referrer-policy/same-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "019debb40a53427247f6021badcd184878d67d0b",
+  "referrer-policy/gen/top.http-rp/unset/xhr/cross-https.no-redirect.http.html": [
+   "d2fe3e21cd9298d7c3509dff0c9c8f1f8281d37e",
    "testharness"
   ],
-  "referrer-policy/spec.src.json": [
-   "f69c289526ab79acdebc872725c00a847685591a",
-   "support"
+  "referrer-policy/gen/top.http-rp/unset/xhr/cross-https.swap-origin.http.html": [
+   "5646eec59885411e0af515d96f8c34024d2948eb",
+   "testharness"
   ],
-  "referrer-policy/spec_json.js": [
-   "346a6218f9e278c550d8829e9089a7da4d8be247",
-   "support"
+  "referrer-policy/gen/top.http-rp/unset/xhr/same-http.keep-origin.http.html": [
+   "67e588307b53ca28c28c9b3e6200b69b1e5f129d",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html": [
-   "849efbc4e7f285e38b9d8f6e747f87cd1638121e",
+  "referrer-policy/gen/top.http-rp/unset/xhr/same-http.no-redirect.http.html": [
+   "e165cb1f414143495575599ed9f858f16c1e57b6",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html": [
-   "d3ee7cb684b1e59ff32a101ad3034c2f9ecd53b7",
+  "referrer-policy/gen/top.http-rp/unset/xhr/same-http.swap-origin.http.html": [
+   "395832acebdd6263ad535224910868beb89cca31",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html": [
-   "0f8d60ca672f2a9b335486120b6d81a3088efb6a",
+  "referrer-policy/gen/top.http-rp/unset/xhr/same-https.keep-origin.http.html": [
+   "99224b7cb6b6deff0b505eb90e71434fbc5c8fe8",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html": [
-   "f09d000eb723a6166ee5bf85a3e93f771813b042",
+  "referrer-policy/gen/top.http-rp/unset/xhr/same-https.no-redirect.http.html": [
+   "a2c89524c97aafcac94308f9517379a90f87a0ca",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html": [
-   "e28acbe94298d32f9d34ff3307993c563ffe25a7",
+  "referrer-policy/gen/top.http-rp/unset/xhr/same-https.swap-origin.http.html": [
+   "d868323f574937678d6a273346d62421c5cee6a9",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html": [
-   "948bb08791912b5ab811ca34da60a997c4e45cb0",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html": [
+   "d5c1ef925326b8b7a5a78dc0d38c0bcf20ef510c",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html": [
-   "ebf8d26f51746bfcc3582006b012d96a9216fab1",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html": [
+   "e1b9a4e96e3bc01cfbe0ea37c1e23c462ac09b6c",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html": [
-   "990f752a23d090d7393b2a676c23ff7710496efb",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html": [
+   "ff187967c8a0a4e38b9e80414462aed4f25a5e85",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html": [
-   "66f41a0e32574feadfd911114f7d48e12b5a846a",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html": [
+   "aebd335274994b93bf00b07f987e6c41b1da3b04",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html": [
-   "8e23ad41dedb44702abceba00b31d5a720b19767",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html": [
+   "ebc64f516ad2d905280b9bfb29d14a99e25fc074",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "3baa66d36b82f19c60c3f85b5f6e2347d43418a4",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html": [
+   "6d2aee1733f3f1d3b91caddbed7140936ba3e46b",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "e5c060c86b3b673d7c9e5360bff394013c7a0267",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html": [
+   "2e465f6103561c575ad1fe457841ebf2390b7811",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "8b036117d70250ae2f624999afecf0c00fedbb23",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html": [
+   "eb63faeca13b7be68dd193ca2622ba347ee0aa8d",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "e165003f6eabbdc0de301971e3f04743e5eb876f",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html": [
+   "74d717b82d05c770bfc988a2c0d811a6c7793e47",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "42492e23b77ec9eb33c5114594f5043f7773ae48",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html": [
+   "d889f2adddaa0866412c2e10a7089d1b8ccbacd5",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "984b0790d4254ea9c18fdb5eed37bd5b436d05a3",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html": [
+   "3a1981b72b4fd2fa598172291515dd23f100b20c",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "9bcf3910c1ecd04a9df83d300398dd42ab4a632a",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html": [
+   "e8c9f719f6c379441795e06d3fd1502bacfe2974",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "cd8c557f05dca5eae753516200ab2c18ec2fba61",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html": [
+   "0e6de725c15bedd4827bd830b849572da78cfad5",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "c38f30635362dd3301e5b37b38b5534c10c125e4",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html": [
+   "f00394f8864ae701a98b4c36b30865ce7ed2249d",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "b38e3d4668b89e961ff4b4d6faef3fe568de4c3b",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html": [
+   "29bbb89fcd4895636fc4656622bfeff320ca0906",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html": [
-   "a90739dc4990357d878770724092e77241d485f1",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html": [
+   "edb2f7d6cf423e69d7de383a4fb8896e290bd006",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html": [
-   "83b3601256f6598d4ecd45da954406b7c8363757",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html": [
+   "245f0e9c4228bb9e8636bf043dd5ba6fef016316",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html": [
-   "72dcd1d2738be6819a7633f3f46b05f6da2d91f9",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html": [
+   "ddd427653f930cb55f3d95a0eca65bfb831a7e2f",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html": [
-   "b56aa7a2c44f5a81ed4f0070c931e7141f620b35",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html": [
+   "118bb843efbdac9dfd24fcf365cd119a8bfc8caa",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html": [
-   "bc6c1bfd1eac88b62d7692257087acf1bdc4ba05",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html": [
+   "e55d45239c2e38fee5f60511f975fc4a7a54851a",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html": [
-   "6087f4b7db9ee86274233ed54c17d812932eedbc",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html": [
+   "34652fae30b2566c39e0a9cd08927408b79ce0ba",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html": [
-   "7d2599a1b7137d8dfd030cd49cf93781c1aa8180",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html": [
+   "798a95496ef3d2ca23c061be834a7f62bf7144f1",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html": [
-   "6581ee64e4ab670f5eeab7cf70e294872f823985",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html": [
+   "399775f8fd6fea8006a9466b2789011ca3d9c995",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html": [
-   "9403ed73bcdac48aef3a973274e980bcbf73f56e",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html": [
+   "99b647b458a3e9f4f6a3368160bed2746a710532",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html": [
-   "5345da2d6d45f40c793760d90aa5d1c4cda84b37",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html": [
+   "b09756f12a1122df07c522daeb9dc77452f6a153",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "7230246dd234ddd552116923751f8838413cbf8a",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html": [
+   "d2a2b71e826b923be99badbcfb2860fdb9927bed",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "382334bba5cccf71d99e6abbbec51ed8e874270a",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html": [
+   "f7c457e5f29240523821c654ab07312ea52a946a",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "8481ed5ab38f218ab79abce299333551263eb6b6",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html": [
+   "24eb8842d054b830d24805f7dd86ba7aea1e4761",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "db04cf7f5cc7620372daa6d0a9c86a6d1dcdcbff",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html": [
+   "17bb9c2610ec44dc13d701589d9b290be4984c1c",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "d35d0c25cc029fab16c1e15b958c9ce0a1ef9756",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html": [
+   "29bbc505f9d157eb8e3bb0f6e64fa6ce5591260d",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "1a6e2a4aeb304f4ca897598060bdbb87bb270a95",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html": [
+   "7963b7905c6b8167761f9ac9eaabe7229fd0ee27",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "117a3dcd2e95c932ef2bf0084374b69472d626a2",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html": [
+   "843e6926217e2fc75011a38b13be349d80924b99",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "bfd21f6f15f12bfe1123e2d44c699b9611097641",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html": [
+   "464aba106c11f4e760b86a0abf77aeb32e005720",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "2e6a113369b5bbcb6de531d36ba95f4fcfa66ba3",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html": [
+   "7dc965416c59126e1798e4e7b1971ce9db3d9187",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "b9d2ab53f9a22f4b2add660ca90793c81ef47c86",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html": [
+   "f941e1e48f968367bcd37cde2b3304eda7e82746",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html": [
-   "4dd11a19be9285e60bc044dd955e808ea8871918",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html": [
+   "1e369f1d45da15fe074e294236bf1104e5594c64",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html": [
+   "780113a6ee496c2ed07d2e0a83288a96f0cacd8c",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html": [
-   "a65eaa7901b8226bafcf4bc79b53743b9eb3f227",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html": [
+   "75648ff4ecf8544945a1f6a9b92c9403a02ab87b",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html": [
+   "816854345fd9ec295410cd9d8ed7db610768a8da",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html": [
-   "7d5e9f51eef167e58e3487a5d415d7b19abf12de",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html": [
+   "0ab03889e984c1e14ca5b9f50fab415fa088300a",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html": [
+   "c7095216619081c2eb5f406611deedf22a53540a",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html": [
-   "bac63c5fb0e01bc986721007605b944ba9cd4a24",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html": [
+   "37ac290d6b36a38edc4273b3dbc40b9ef2888b0c",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html": [
+   "70ea43205552309af38654b1bdf3ba90ed6acf76",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html": [
-   "60d5073c3fc1d74d7acdb8e1c41d5aca39e58ae9",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html": [
+   "0a25233e4f17b258bcd415430b989bfa0cb71c05",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html": [
+   "0460050d4baa60c1414c0992051bf092f7461e85",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html": [
-   "6be18f7699de255881c679427696c5811714e00c",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html": [
+   "0e7cdab08f80d12b23eacacbeb48d30785f7cf0e",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html": [
+   "7fb8cf98201a176cc4078136968c44902de55036",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html": [
-   "952e77c9cc696858a6fcc455c7397556ea0d190e",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html": [
+   "e49c19a7486cb1c35d30d0bfffebe62309240c08",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html": [
+   "d7be1b63225b92aaae3d028813eb7bc4fcdcf16d",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html": [
-   "48f71be2eb18b34d00592caf6d953e9df61efaa8",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html": [
+   "79dc86420b0143a4a2749b11d0745b7238b55f82",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html": [
+   "013fc3a5a3f4e253d6de2392106013e41ee99565",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html": [
-   "a28deb3c0dc087cf32959b5042b60b175fcf4572",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html": [
+   "20c9d84a14078f0a28549738eba59361729b91ed",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html": [
+   "9d9b89a2560a674fc6cc5a78c263db24dd2b0c94",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html": [
-   "2ebcc268d9326694b3372cd1e8f0f288bdf06784",
+  "referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html": [
+   "71d97ee0390ed6ec4722b99571e6709ea46e98bf",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.keep-origin.http.html": [
+   "29533784c3f3365ee57323ba9ba5e301a3071f6e",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html": [
-   "6425c693b33390a9f224b682a4d4842e3e9a6c43",
+  "referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.no-redirect.http.html": [
+   "fa3d946a8ae4d8fbf0030bfb08937160fc5c9fc4",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.swap-origin.http.html": [
+   "aea45c919e49cbfa24b282a05c0d2b0415ded39b",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html": [
-   "fcae5517b70fa522a0fdcebaf8ab446567d902ff",
+  "referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.keep-origin.http.html": [
+   "787b33c1ea074d8f2b3bb8737d316c5920f15468",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.no-redirect.http.html": [
+   "8295a63e05a32eceaa16db6c74ee5f3a51e57df0",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html": [
-   "92437dea18b3809878f44bed97975fc1477ec646",
+  "referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.swap-origin.http.html": [
+   "3481eda3ed7cd02d93c40806496bae6e372dad1a",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer/fetch/same-http.keep-origin.http.html": [
+   "153563a38b36bcf21d6a133d81de62c49c263fd7",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html": [
-   "9d2f1dc7bb05644439ded95ab122cc08120ab3f0",
+  "referrer-policy/gen/top.meta/no-referrer/fetch/same-http.no-redirect.http.html": [
+   "c19107476238afb4ee491745b43e10278b61edb8",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer/fetch/same-http.swap-origin.http.html": [
+   "1d87d656f6799cfc337559d7036eadbabbf23282",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html": [
-   "77a7c7198da445bdad4388fc789e47a9c894b0f7",
+  "referrer-policy/gen/top.meta/no-referrer/fetch/same-https.keep-origin.http.html": [
+   "38fe934f9a917dabc8fd53054b256519b3ee4aa1",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer/fetch/same-https.no-redirect.http.html": [
+   "a43637790ace3201c1e4c49cfe059e40604769b1",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html": [
-   "490c294ced54d95ea0d7b01a32a79488440335f7",
+  "referrer-policy/gen/top.meta/no-referrer/fetch/same-https.swap-origin.http.html": [
+   "98fe5237308cb40491b2211e5f15649049e7c8ff",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.keep-origin.http.html": [
+   "bb306873bd803e58663def20eb4eab48356441f6",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "22f1f3bdc72507d8c64e0af65d94e4f4df3813b7",
+  "referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.no-redirect.http.html": [
+   "f8e7262bd810d991c4e915a32b9ac8ccf2bd4187",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.swap-origin.http.html": [
+   "b0d75cf0323024ef2187852aa1959c6c686fbfba",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "bb47761b3b592311adf367826f6b8c12e3d8fe6d",
+  "referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.keep-origin.http.html": [
+   "6892ef7c4d46896fbab4f51abe6b7e502c67b0a3",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.no-redirect.http.html": [
+   "589122d0e9ff94089e266b8004d6e5a72ec11318",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "4dc7edb6f57117af0921062cf1002d121cd71abf",
+  "referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.swap-origin.http.html": [
+   "f4b1440f04bab4e8c2507fec623f0d2936fefc48",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.keep-origin.http.html": [
+   "3d85b52254ec15caeb9b1045dd38cb78b2b039a9",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "11d7fe3e2615b8dbd292b19e96828f64bf402d9a",
+  "referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.no-redirect.http.html": [
+   "89d6d634187e9968c38e81e2eefa8f19eea1d860",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.swap-origin.http.html": [
+   "ba283d5a7379c027de8118a06a1d90c62ce5dc04",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "12e2c923aa91f32303b50d21c464e5294e7bdbd6",
+  "referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.keep-origin.http.html": [
+   "35b805dcf3033a7a0595b15288cd534aa31a2ba9",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.no-redirect.http.html": [
+   "fb1f7ad461b8d01f1564b2a1c4475212bd82d39a",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "269c233f650eab06ed06ff43c169c11d39a3e16e",
+  "referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.swap-origin.http.html": [
+   "60516dfec7970cd8a05d886e8c71daa683edb73b",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.keep-origin.http.html": [
+   "9574d97ad89759a77330fd9e2ebd4e1fed6933a3",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "3dc041adb2badfb2316b75dbffe974f2a0508d13",
+  "referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.no-redirect.http.html": [
+   "b71bb9fe8ad01f2915125d0a50bf641766a7449f",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.swap-origin.http.html": [
+   "12cc3dd81a7c293a64e9bbe1bca4c1207a77f9d7",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "7985b8b5397af14023b10a458cf4bff381e6362f",
+  "referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.keep-origin.http.html": [
+   "8bfbb561e96ec75f74795b970f7aa4be6bf9b348",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.no-redirect.http.html": [
+   "9bec2a9a425cae89073e6dfd164bddd7fda75afa",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "6f2526ec2ce8aeaf9167692df1c905cfab3e796e",
+  "referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.swap-origin.http.html": [
+   "f0e8af619c05266f4a0effe28ece25c5c4ec4b87",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.keep-origin.http.html": [
+   "42f74dc4a201ef1c50837ad14f35d432611a6dc8",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "408a84a46e951c36c0feb9bdd0212a993e95920b",
+  "referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.no-redirect.http.html": [
+   "87492a8c6514c311fbf5a8648e5ca8b607fc9541",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.swap-origin.http.html": [
+   "f4f634401b1cef2e1c9194e313e280532ffd9cd0",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "73a6d401686e1a0f95f9f8bae9869033bc349d2d",
+  "referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.keep-origin.http.html": [
+   "7aae843c139803e4de43a437288b28e4037bb708",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.no-redirect.http.html": [
+   "127e701ac50205a6ccffc5f7776e290fe8b0068b",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "db3836944c071dba460dce59008ea6fa17a961f9",
+  "referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.swap-origin.http.html": [
+   "916cbe7f4a7dbcc834302bdee324a467e1a69201",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.keep-origin.http.html": [
+   "238d76c056d582a3ec6e60bfe3b693e8137af9e0",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "3e93e19a7183a6c4fcf410cc1e4a8fa454d2d386",
+  "referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.no-redirect.http.html": [
+   "a0902935a133774d0751fb31694f5c5778fe0791",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer/worker-classic/same-http.keep-origin.http.html": [
+   "047a7a8f891b3d40a730be9dac7f02192d3598ef",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "f556a17b5f43bf05afd4754e3cd640e936242a8c",
+  "referrer-policy/gen/top.meta/no-referrer/worker-classic/same-http.no-redirect.http.html": [
+   "075b7c7043f633e31a764d0d4c765232e9491e37",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer/worker-module/same-http.keep-origin.http.html": [
+   "9150b8631d77061bae8ac435cb47f065d248ddd1",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "966ccd4a906dc0d41afd3ac3ee3ff674d367a503",
+  "referrer-policy/gen/top.meta/no-referrer/worker-module/same-http.no-redirect.http.html": [
+   "e0d49ad70592ba776d4433c1640a6e8d3390a39f",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.keep-origin.http.html": [
+   "0ef6e1031f86a9264816f4f309178b3fb54db6ef",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "b0f1c512bb354c56d3f510c90450ca4ee6c18699",
+  "referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.no-redirect.http.html": [
+   "c7ecbb83014417fefe35f39593d5cb44176ab0b9",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.swap-origin.http.html": [
+   "12cb9b5ba93753f1f2fd1954236d78bbf0e7cbbc",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html": [
-   "26ba53745768bde86374b247c4543ee89ae0bc59",
+  "referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.keep-origin.http.html": [
+   "28d9711ca7c26c2660297401fdd743554b90aed8",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.no-redirect.http.html": [
+   "e72cc70a4f2b71be6a90fe20cb3a290ec1373336",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html": [
-   "3c24da11403ba810b323e612cd6f159b87490c90",
+  "referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.swap-origin.http.html": [
+   "896939dfae53625a9b7caf2c6752c36be147e579",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer/xhr/same-http.keep-origin.http.html": [
+   "22886a1de5848ef0d65ab20ecc82e75d54a27027",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html": [
-   "5147d1ae55f909add4f70d4992f513c511f0e8b3",
+  "referrer-policy/gen/top.meta/no-referrer/xhr/same-http.no-redirect.http.html": [
+   "9c5bbb3e91458245372eea367c3c6da72b37f744",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer/xhr/same-http.swap-origin.http.html": [
+   "c526d733ebf4776d2b2dc8c816153f16f4b7dac7",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html": [
-   "5f043f56d9cbed2f7b2705ee75382ee730d7cc9d",
+  "referrer-policy/gen/top.meta/no-referrer/xhr/same-https.keep-origin.http.html": [
+   "1d3a007c1ef1c828c12b16af9b7fce1f01cc3ea1",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/no-referrer/xhr/same-https.no-redirect.http.html": [
+   "793c851998d45497e96cd2532f5e354b19b0b7a3",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html": [
-   "7235b46f693e4457851cd92e86ac7d3cba8e1710",
+  "referrer-policy/gen/top.meta/no-referrer/xhr/same-https.swap-origin.http.html": [
+   "98b4af4aa36a0149db3048b2317400eec0cf1f1a",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html": [
+   "74384c6c1f4f74a89cf0a6b9ef86055d207cf664",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html": [
-   "898791470cd9ee167418082b55997ce19a6abb6b",
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html": [
+   "84dfbd78e6c5b54923dcfcef42f6809c4df512e1",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html": [
+   "1cb2eb25b9890316fff6ab4d8dce30cdadd7acae",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html": [
-   "915a0e04cb1a09f33261aa9fe94cc422d1bf45e0",
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html": [
+   "28b8c14447448e322c3e2ff6cb4cfae671d2c44b",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html": [
+   "92caf095e05a080c16d19154e601dbbde08a831a",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html": [
-   "2b5c254b315f0bfdac8a08a7f8980bb43da4609a",
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html": [
+   "05e1d8ed70c155aaefb87f75947a1564a5ee40b7",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.keep-origin.http.html": [
+   "5a2c3706c77f1bed1cdd47671321fbab5e5700b1",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html": [
-   "448fc03146a86d8f18d8ef8956345ec40ce708f2",
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.no-redirect.http.html": [
+   "98119ade78e843ac7727c316f4b11f8ba0646053",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.swap-origin.http.html": [
+   "153fbe73c330b5363269e0f9c50280bc1bf7bd52",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html": [
-   "b71a1ba2fea9cfb6325ae0e1f6303372beec70b8",
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.keep-origin.http.html": [
+   "eebe2d506acaa31d54dde32fe068844d2830da95",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.no-redirect.http.html": [
+   "556d503c973bcc946d4ca29a8dd4e26265f21bcf",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html": [
-   "c23f33e377c37bffd6eeeec7ee4c5914653d6875",
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.swap-origin.http.html": [
+   "1f1d780c61506ecc39f35f4773d71ec96e9988b2",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html": [
+   "c40ee82385e0b286b45f4fa4e2339825820c5154",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html": [
-   "0f8a61233184e8cbc45dde9b78c94932eca42f43",
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html": [
+   "bf99ea1b980f5cee304ad043f34fb0ee0ec31be9",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html": [
+   "47ce26153a6d9d7790f6c6acdb6bd10eb868d4bf",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html": [
-   "25e7bed49668540dd91052806be7e1fe527ccd04",
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html": [
+   "450142261f38dcf7da74bb932502b8a278ed34f1",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html": [
+   "e96342b7d302fd63204cf873ae52360d5b019c30",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html": [
-   "0366ca590a20f83d658ceb67b05316e7fe74f892",
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html": [
+   "3aed562819450ed50791dc428fdb27a732be4cac",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html": [
+   "a280c51a648588ba7c59f4105543f3b62026f703",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html": [
-   "e43090fc94db3696d4f02bd4e7df47e43c48fcae",
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html": [
+   "9c6ccb79207594cdf34acfa8d7c56c04e03cab00",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html": [
+   "829e02d2b6381d9fbc1031780d81e8106cbee17c",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html": [
-   "94737a8ad11f4ea7d4c9ff65252a3aa7ee8cc60c",
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html": [
+   "ae420db20acf22eb7ccaadeb2f7ced4789a53af2",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html": [
+   "6aed72d2702ef2040a939731c7b7723dbfb324d5",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html": [
-   "7f20701fc23b5b089e05629e3151cf7f83b24d6b",
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html": [
+   "f29d9a5f033972703a092c987b0a8ae9a8010d39",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html": [
+   "e2b5a99d82bb90a702d72b5b4cb04f5a5efa9ab0",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html": [
-   "1e0251a14db6b0415f32eca350357a53e8abfc86",
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html": [
+   "386be93bf6358a322717f9cd770ab62bcd231f48",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html": [
+   "3a5518eadd0dba5e9f7ef891597c51f32c45cfbf",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html": [
-   "a04b093f0525207dadb659d96f36a704aaf70d9a",
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html": [
+   "88126506ddde2a18e5105c6c0b7cd8c01ef27f0b",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html": [
+   "dacd343e0cc4306a27898a13778098f44d9cf9fa",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html": [
-   "4c888a8955acb7c8a054163924cde507bda79e07",
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html": [
+   "6ca297fdafa8dbe92a3caa8a101e94d68d89f50b",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html": [
+   "ac0e701aaa3461f424547db389cc4047cc22dc70",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html": [
-   "ea5c378b938ce2a66188ab352fcea39d81a687ca",
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html": [
+   "36a6ca56fe562075d14e7f7613cd99c720baf002",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html": [
+   "3196566b1965c89ede03949090f38f54153244aa",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html": [
-   "f95d9dcf86267fa550742e4c39cfe8339abed669",
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html": [
+   "8c41b0aa0a8bddc0a6fc83421996d2859147f659",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html": [
+   "1fdda9f6e1e4ba551762bfde2921e799ad50e791",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "2fe55648eebf16c4d566eb6514f5380a060119bd",
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html": [
+   "228b216bf6025c316323322dec56d3242f983662",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html": [
+   "d8b81424121c4749f36ae7f05784a53fa32fa1d9",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "805c1fce6ec61832f4168bf459977e44c161e42e",
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html": [
+   "13907b6ee3ffefee38792ea3771e8cdaa880fadc",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html": [
+   "2d47f33f9615924849abcb5067e30fc8d9c66598",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "3be3cef8fe6e3942c56164d94efffaa791894b0a",
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html": [
+   "1a94c31e6e62f8d3a21d5d68de8c64f299dd1139",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html": [
+   "0014f4695628bbd02346f44f754e4080d79fdd60",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "001876c67eac2d65c0691d6fab6c9bfa4d3f11ec",
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html": [
+   "8153dc4feace0820d9709e185ae6167eb9f35d8c",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html": [
+   "3c5fde6f1838007e7c2fb6463e9af4c50b22f25c",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "d065511201c53b37677864f7203d35c5f53a8fef",
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html": [
+   "3615808744e0ee5670d63368bfaad2e89e095432",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html": [
+   "3103661f217d47b4c6f0009855cac98b95e72f8d",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "8372e89bb963b59ec9a0032f20e470488c2045af",
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html": [
+   "6adf33ef956f9d16c2bd06b24b9f5828ea1f7ec8",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html": [
+   "187fcb55c867617ae958c91e15fab0acdb76074e",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "0cb91426123cb96a1196e3d062629aaf342d3cc4",
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html": [
+   "d0a065920323d1d3a4817111ddb4cee8c52b2a19",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.keep-origin.http.html": [
+   "fd98090afeb652cdf73e67c926dab2800801adbb",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "880ac9540146f6c72f4bbdc1ca67e402712d663a",
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.no-redirect.http.html": [
+   "5ca1a8f90deb6ddf522dd47b2e2fe9cae70528ea",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.swap-origin.http.html": [
+   "ef2c88d8a3d2e0d3fc5f659ca07b2ac7cd341fde",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "d1e21f26bee30a723a7f427c05b7a0b0e6fa256f",
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.keep-origin.http.html": [
+   "ccb48c901026e8e2f81bafc01462cded914ecc9d",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.no-redirect.http.html": [
+   "95c24803a4cd06c96022fbbcb2fa441c5c0e290e",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "81ea510e48283f0ddbedebd8a728cc61849bf4f2",
+  "referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.swap-origin.http.html": [
+   "3a3eeacb397fdfcb07f4da4ce651e36272f74eba",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin/fetch/cross-http.keep-origin.http.html": [
+   "867e453f9c923119a7425c57cec7f5594c8a1494",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "663532798418ca23df55ce3f7927d3a933ee85a1",
+  "referrer-policy/gen/top.meta/origin/fetch/cross-http.no-redirect.http.html": [
+   "b2ddcd35351241fae77376f27ec978f18c935520",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin/fetch/cross-http.swap-origin.http.html": [
+   "955985163c27560c1a2ca4a87ab88ba272b80cc2",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "d9bc87d7ed19fda72fb7afefe2a29e1506b93af6",
+  "referrer-policy/gen/top.meta/origin/fetch/cross-https.keep-origin.http.html": [
+   "8cc66b40477736e3d1434de0fb9c48fc2fe061bf",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin/fetch/cross-https.no-redirect.http.html": [
+   "6f7f790742b146b5cde63032b12f9fed0f723b06",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "f4c0db2b33b9f959804de082678b4244d2b16de9",
+  "referrer-policy/gen/top.meta/origin/fetch/cross-https.swap-origin.http.html": [
+   "a8475099903c7c3fcf1e5310ff3a9f5cd72f3172",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin/fetch/same-http.keep-origin.http.html": [
+   "fdfcaa51c37f26d98a4e6545e52ba93172994fea",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "e0a4c18164a223f656bca20615acc77ae1898122",
+  "referrer-policy/gen/top.meta/origin/fetch/same-http.no-redirect.http.html": [
+   "7daa30e19be34a59a6d7e2c4810794ca319c5a67",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin/fetch/same-http.swap-origin.http.html": [
+   "bbc11c950d10d074556bf6e99e7b332ab5383286",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "ddf12c7dfbc00c191b836368289b5a3e168809fe",
+  "referrer-policy/gen/top.meta/origin/fetch/same-https.keep-origin.http.html": [
+   "f07cda1a0ae7faea6363ab51f3203f6f7d1e53f4",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin/fetch/same-https.no-redirect.http.html": [
+   "17ced6cb6334d29e46950c1b105e68c1d278ab1f",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "967c856ca9453215c14f47682e5f5c384ccc1899",
+  "referrer-policy/gen/top.meta/origin/fetch/same-https.swap-origin.http.html": [
+   "297a37bcccd9294d27c09cb57430fcb66ae2a517",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
-   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
-   "support"
+  "referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.keep-origin.http.html": [
+   "aec51043d2532b88ee7780d8b8213a9e1dbe4866",
+   "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html": [
-   "e2c794e2e2703178b33309c15df52fc5a92933fa",
+  "referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.no-redirect.http.html": [
+   "ea5a1e65912675187835c20a2a908ee7a5fbf615",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html": [
-   "1d53a856484fdd89788f01d9a4b845effd7978dc",
+  "referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.swap-origin.http.html": [
+   "5dd09037aed5402ae94a40c40c8dbd9dad61fed9",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html": [
-   "11002b84ccd9df3557d2e6ddbf02cb16ad2fedd4",
+  "referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.keep-origin.http.html": [
+   "d2eace1a501c220780ef96e1b50973afd50824b7",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html": [
-   "0660a7152c1fcc70b13f1217e8d5c322eec9a588",
+  "referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.no-redirect.http.html": [
+   "7a2872df2d615a72b8c435ec4ace478f8e600735",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html": [
-   "6dcd7f6fb5cc911026deb559215746d75589d151",
+  "referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.swap-origin.http.html": [
+   "6c3af754b6149fda84544c1b0a815dba6cfb7848",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html": [
-   "0776180d9a21724f75f8e9a425d8ea63f62712f7",
+  "referrer-policy/gen/top.meta/origin/iframe-tag/same-http.keep-origin.http.html": [
+   "1fde956c52e65732797cf9a11d225dff86d8738f",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html": [
-   "38e9578454e0fe748dd9cc37b4c954a55c81e7ab",
+  "referrer-policy/gen/top.meta/origin/iframe-tag/same-http.no-redirect.http.html": [
+   "9090a56f19c6376d3ec6cae91ad54959220675f8",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html": [
-   "6f0993c801077a16480913be20c0375af1eb9eb8",
+  "referrer-policy/gen/top.meta/origin/iframe-tag/same-http.swap-origin.http.html": [
+   "69827f5e71d7a38e83ace9292f38237e3a496317",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html": [
-   "9e03d5384e9b34246df8ee78306ff83c71cdc38e",
+  "referrer-policy/gen/top.meta/origin/iframe-tag/same-https.keep-origin.http.html": [
+   "321ff5d2dfb91f152442a4b9e6b21d3bab9c3cf3",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html": [
-   "1a928cfec18993f7e92e5d9d500fa595e9ca4248",
+  "referrer-policy/gen/top.meta/origin/iframe-tag/same-https.no-redirect.http.html": [
+   "46d567048a5883f494ed4c8f4f4d5a2434b4b667",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html": [
-   "ab822dec774ded2572fe0d66048ac412619182ca",
+  "referrer-policy/gen/top.meta/origin/iframe-tag/same-https.swap-origin.http.html": [
+   "64567589fa4012692de16ea36728adf33e102bfb",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html": [
-   "c51ebf6c472977b322e40b09cc6b24a2b6301713",
+  "referrer-policy/gen/top.meta/origin/script-tag/cross-http.keep-origin.http.html": [
+   "2494c0a49e8d42e26438abbbbf9f326bf115ffa2",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html": [
-   "14ee299d92afc533582cf1c6c61ecfeae34d6b2f",
+  "referrer-policy/gen/top.meta/origin/script-tag/cross-http.no-redirect.http.html": [
+   "5be226f439c883b16e699c069d71c64af3e565f5",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html": [
-   "ead14cf5f9d95cc7948facf9132ebd024e0ae1eb",
+  "referrer-policy/gen/top.meta/origin/script-tag/cross-http.swap-origin.http.html": [
+   "3496ddd889f386c3db2bb340fae93c12e9566d0b",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html": [
-   "1ee7fd41367e463deced7af98706b5df55374e64",
+  "referrer-policy/gen/top.meta/origin/script-tag/cross-https.keep-origin.http.html": [
+   "ec31a89afa5d0142bb638772fc7667c44a5bc1e6",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html": [
-   "0110bf0e34f804bcaa84de2612fa5669e0ecf822",
+  "referrer-policy/gen/top.meta/origin/script-tag/cross-https.no-redirect.http.html": [
+   "fcf281ec367b754067810db58a93b39884dadeeb",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "12a1bc66e0f32ca381103438654b2bece3152b14",
+  "referrer-policy/gen/top.meta/origin/script-tag/cross-https.swap-origin.http.html": [
+   "93076790b29c30f1c51655658dbbb2877d2893fc",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "05ade9a95627e9a26924d4cc71f35bd9505cf527",
+  "referrer-policy/gen/top.meta/origin/script-tag/same-http.keep-origin.http.html": [
+   "7f420bd58c185b0d7e94a0181bed74e771e189e7",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "ad0fa26cee566fb4b6bedf853380d63813f8c84b",
+  "referrer-policy/gen/top.meta/origin/script-tag/same-http.no-redirect.http.html": [
+   "75182127e9bdf4c8610ca5abd2eb97bf7f4ef2a8",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "074dc1c008c7bb8e8fdde6f8ff02c6853eb1f221",
+  "referrer-policy/gen/top.meta/origin/script-tag/same-http.swap-origin.http.html": [
+   "26f358b9db98ff501a32496a693e2f28c05329bb",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "02a8550756e871660b27addae7ec82d416988d43",
+  "referrer-policy/gen/top.meta/origin/script-tag/same-https.keep-origin.http.html": [
+   "f6a725d396322644acd427353c53197c49d40ef8",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "c67cc2478a0c4ec22e2aaf7f6c5d59c67dad6ee4",
+  "referrer-policy/gen/top.meta/origin/script-tag/same-https.no-redirect.http.html": [
+   "b09d3f025e926da42e8d67de2315af37da104cb9",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "e53c8315664a59467e4cf9104ec53d468a16a506",
+  "referrer-policy/gen/top.meta/origin/script-tag/same-https.swap-origin.http.html": [
+   "9e57f2f6421dc2fee6860f3c28b9838382601bae",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "3e11ade1bcf49632358cb1369706410b127b0326",
+  "referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.keep-origin.http.html": [
+   "32c9c6a506faac59d4091674d72385c4ee367751",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "27c4c842c947d851d30f484899de7817cc3b9b30",
+  "referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.no-redirect.http.html": [
+   "f24202d4c1b7f85e4a9ecbdbc43f1a232cf3f5e1",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "f28e884825ec8151381ea7096a08ee0b9970d1c0",
+  "referrer-policy/gen/top.meta/origin/worker-classic/same-http.keep-origin.http.html": [
+   "525c4babfbf37d61ea2ebdebdbecc0bfb5ea4470",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "5c8ef0ef3e36534c6f55d20a350eea2b057cc8c0",
+  "referrer-policy/gen/top.meta/origin/worker-classic/same-http.no-redirect.http.html": [
+   "c1c8aa627c0180a4d4b2a9a6f24c0d5b7b683969",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "bb9bf2c1ee527e28565534ee1c2d28822c4fc4ba",
+  "referrer-policy/gen/top.meta/origin/worker-module/same-http.keep-origin.http.html": [
+   "8482d7d2aaf55fe91fb22fbfd8a737d3038b064c",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "a4798d7b47dc4b40d8ccab8ba165960dd39083e8",
+  "referrer-policy/gen/top.meta/origin/worker-module/same-http.no-redirect.http.html": [
+   "01fd9140510450be1317f34e29147d50dcabfd0c",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "0b58c64c20083db51771bd7c3cace87a110ee4f5",
+  "referrer-policy/gen/top.meta/origin/xhr/cross-http.keep-origin.http.html": [
+   "10ae3a06788f5740dd0edebb7d534bcd83907eeb",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "3ab27355d0961a88c2b5027d5a23c43181deb5c4",
+  "referrer-policy/gen/top.meta/origin/xhr/cross-http.no-redirect.http.html": [
+   "21015150882dece291fd9cfb976bfb6889cdb545",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "6c8d7ecd7b86dc645eff07273de21cce82e4bb94",
+  "referrer-policy/gen/top.meta/origin/xhr/cross-http.swap-origin.http.html": [
+   "8450e8b704486844fb1ab38d0e400915e607b550",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html": [
-   "62b85068c20f75deb45c338bbb0fecfdef214f38",
+  "referrer-policy/gen/top.meta/origin/xhr/cross-https.keep-origin.http.html": [
+   "f20930965653416eb0c832ba1624e0dff81c86c3",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html": [
-   "efcd74ac789e061e8bdf00f71b16efa680feadf0",
+  "referrer-policy/gen/top.meta/origin/xhr/cross-https.no-redirect.http.html": [
+   "bd7f2f73327d38afcac57fdc2c9784d65d844b68",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html": [
-   "eb84455bc12bbd49cf390d13c16a7a1213686249",
+  "referrer-policy/gen/top.meta/origin/xhr/cross-https.swap-origin.http.html": [
+   "ee4f2c5c6b1808690332090e0e5a2a5bbdbb8d58",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html": [
-   "dc71fc362ed21dcc213dea7b331b3db2d70ce51d",
+  "referrer-policy/gen/top.meta/origin/xhr/same-http.keep-origin.http.html": [
+   "011a0a9d20f9388bc34ff5e0a60575ce10694d16",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html": [
-   "8752f5d2cc850bbd9a3641d18841348d11178b2b",
+  "referrer-policy/gen/top.meta/origin/xhr/same-http.no-redirect.http.html": [
+   "aed06c5c1b893ac199b645f63e87e9d990990a82",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html": [
-   "4c3a3e733ddabf4cc85d1adefc938a557d97ebbd",
+  "referrer-policy/gen/top.meta/origin/xhr/same-http.swap-origin.http.html": [
+   "c6d9c461b9bfd6eb95681936c2239a516175d598",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html": [
-   "33640559429c05e53955c8ea74c5e64e8500ddfc",
+  "referrer-policy/gen/top.meta/origin/xhr/same-https.keep-origin.http.html": [
+   "cb5e94086b0514b9232099d9ed4eac7ddbca4e4d",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html": [
-   "9acebe2f0b09702c5f00103067bc748e9f4b5744",
+  "referrer-policy/gen/top.meta/origin/xhr/same-https.no-redirect.http.html": [
+   "1702c3f10f8d75e09e723346709579203545dfa4",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html": [
-   "d1f8677bc8b25eaf2f27b83d91ccad1bd1bb9b41",
+  "referrer-policy/gen/top.meta/origin/xhr/same-https.swap-origin.http.html": [
+   "674b324bded844ca9826eabb4e0d1769cd001f24",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html": [
-   "a205d415fa384d246f497656e6bce1cfa161368e",
+  "referrer-policy/gen/top.meta/same-origin/fetch/cross-http.keep-origin.http.html": [
+   "4623293b2b98547b4f185ddd6ca3b675e5e582e6",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html": [
-   "dbffdfd9b707e88f5f28860eee87fe5f443c7631",
+  "referrer-policy/gen/top.meta/same-origin/fetch/cross-http.no-redirect.http.html": [
+   "3d2b7856f67066fccea45e2dd1f8536fe9f6936f",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html": [
-   "ac598a4aef96049385b08267dc3c377c2e5ee376",
+  "referrer-policy/gen/top.meta/same-origin/fetch/cross-http.swap-origin.http.html": [
+   "6f86e2c9fe67a8e7a621e2c0850dea051008fa41",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html": [
-   "fe796af905de4fe4111cef8abea5e089eb2b83a8",
+  "referrer-policy/gen/top.meta/same-origin/fetch/cross-https.keep-origin.http.html": [
+   "9734af21a03e2bb78121df4a5d261d8c1f5a1576",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html": [
-   "df0b66b578af3223d45b29041558bf4e1661e04e",
+  "referrer-policy/gen/top.meta/same-origin/fetch/cross-https.no-redirect.http.html": [
+   "dd32b51d9cd5a236d3ce6477186a5eeb66ebe3dd",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html": [
-   "3e6a5ef1e50317b735fdc3abeaba0d7228a764f8",
+  "referrer-policy/gen/top.meta/same-origin/fetch/cross-https.swap-origin.http.html": [
+   "375ac257f6a7126e24816624d91cc3f147bb4d91",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html": [
-   "fc8d3c41bbbc5d1af4c4482e6de160d7978a3b70",
+  "referrer-policy/gen/top.meta/same-origin/fetch/same-http.keep-origin.http.html": [
+   "6742ffba5680348fe242e11468118209b6cbcca1",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html": [
-   "3291f436ea9a1bfb7a8018bed641c364c1446c1b",
+  "referrer-policy/gen/top.meta/same-origin/fetch/same-http.no-redirect.http.html": [
+   "67ecbd6eefb54c1b90d8ba903e6be9519c28ef37",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html": [
-   "19ad046a8a67f96ce419bb44ab822a02c7b7682c",
+  "referrer-policy/gen/top.meta/same-origin/fetch/same-http.swap-origin.http.html": [
+   "6163be73c9e2ba94aa0e015519ab73f6b5c2d25b",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html": [
-   "c8fe4c6ec6f86915b77e6095a6127d099637c825",
+  "referrer-policy/gen/top.meta/same-origin/fetch/same-https.swap-origin.http.html": [
+   "0bc2c07d8316c27d77ebd74ddfb68359e9fc17bc",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html": [
-   "ec2f7efe8ac7dc521f7b2f25668d96482d42a175",
+  "referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.keep-origin.http.html": [
+   "cf05e166a2335c1b6b3480bafb4e28dfb05f7bfb",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html": [
-   "207a092d6798444ebc8a83af699623c50e097684",
+  "referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.no-redirect.http.html": [
+   "15ac1c56f435634b72fc23dc812f68c9575c501d",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html": [
-   "6ca54f8161040c78f75e411cdbd844cd0dfefef5",
+  "referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.swap-origin.http.html": [
+   "54a2884ecd301353ef2be80ce3db9436d546e175",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "d8ba3dd25db345606c23cada85894fb6a4438456",
+  "referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.keep-origin.http.html": [
+   "3e7e1bc166b6aa46ca740fc07469c0f0356c4211",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "6d3dc7018c6a28283c1fa349127a96952b4517e6",
+  "referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.no-redirect.http.html": [
+   "942691f66aef6e30e48dc89fc073535a79e517cf",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "685cb213ab02e952e458b4a9cd517c5f9b6fd4ff",
+  "referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.swap-origin.http.html": [
+   "cf51aa15b1b388082694e30853658ba8c90d752d",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "65b84cbd52ea2c2c0df226a61cc982fb61c3b3c6",
+  "referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.keep-origin.http.html": [
+   "d87e8674b1d64a4581dce283d5a9a91fe8bff657",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "931a865b0a02b7ef2607a09e061f1ebdf1443035",
+  "referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.no-redirect.http.html": [
+   "8bc96f3cb553e4cb0002881e5c0da68497134fc5",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "44da9c8838ea94c82e1f3b7c037c93c3b5ef8a6a",
+  "referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.swap-origin.http.html": [
+   "16e76d16d20001159ef33227f8aaeee3f75475f5",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "3e272c6f36d9bebf5ca281be728511943a851ac1",
+  "referrer-policy/gen/top.meta/same-origin/iframe-tag/same-https.swap-origin.http.html": [
+   "84063c89db2fa5425c81f4a1f32db835ea6313a2",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "4b94af4929c8b30586ba2b477233e7e493103b4b",
+  "referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.keep-origin.http.html": [
+   "b7e3924092b5dfe03caf3d7a44fe3c74251f41b1",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "95d6345f7c4034ce5f7d8c0c3302f921a72357bb",
+  "referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.no-redirect.http.html": [
+   "5ff171a3863604df0a80673e1e02a192b915b3f2",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "17f127f60366df1597b5187241a7e7437172152e",
+  "referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.swap-origin.http.html": [
+   "0361ecee0422419988d4d37e44ab89d5fd0b9a1b",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "bfb222a4475e3e30e4157b226a6691ad8a8cc36a",
+  "referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.keep-origin.http.html": [
+   "c2223be2345599fce0f714fe911dea54dc94caba",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "e989b00ce58422bf96d5edadc6bdce3bfe8a5bba",
+  "referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.no-redirect.http.html": [
+   "9655ad2b23833661ac4855ceb0449b703f682a52",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "a1f1e0e6f1bb844ba25187609dfd4e5e02bf3f3e",
+  "referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.swap-origin.http.html": [
+   "dab25e384d7140165ce0e41e56dc7c9925747818",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "ec4786e1e4da125ba01fb8a32debbcb749625980",
+  "referrer-policy/gen/top.meta/same-origin/script-tag/same-http.keep-origin.http.html": [
+   "694a8a845b2e88e17f5d57110e26dafb3c16ae61",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "baee333cbb8e278265153f34cce2ec68b37f6924",
+  "referrer-policy/gen/top.meta/same-origin/script-tag/same-http.no-redirect.http.html": [
+   "6dfac02ae12230547e67b2c43d7e73193f037131",
    "testharness"
   ],
-  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "2041b46c26cadda361ddaa2843cffd7f1ebb7f77",
+  "referrer-policy/gen/top.meta/same-origin/script-tag/same-http.swap-origin.http.html": [
+   "65d0d0371428bf9c174dab0394c193e4d3d52984",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "2fb347ef35b8ecc2206f272db95156cdb9a0e771",
+  "referrer-policy/gen/top.meta/same-origin/script-tag/same-https.swap-origin.http.html": [
+   "3c6e7b143e967c38725bcf2db74bc08dfc21ba48",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "0c34da119fcb3634866a7fe153256c3c92fcfa3f",
+  "referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.keep-origin.http.html": [
+   "d5396abbc58275ac4e6deafc88d252cafd026447",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "f992e3939256b8eb977231539bed90323c4b3ccd",
+  "referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.no-redirect.http.html": [
+   "d6e198ad0a9363a67788b563bdcf120ab875e13b",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "e1e6c13ea358c7f8f0178a37a30505271bb2b446",
+  "referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.keep-origin.http.html": [
+   "bb60709ee88cfee1f7ceabb6892933ba73c7fc50",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "fc07b47fd6408b74c6767dbfc385adf699844614",
+  "referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.no-redirect.http.html": [
+   "1054ef30ef0abfde188b862e549fb0cc670ab69a",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "083891dc3c131fb56f8d5372ca206b597c6cae71",
+  "referrer-policy/gen/top.meta/same-origin/worker-module/same-http.keep-origin.http.html": [
+   "3896c5c5d216369648a233c93ccf3437b6ad967a",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "07601e37eb0bc39eb87bc3c8901d27bf6792f61f",
+  "referrer-policy/gen/top.meta/same-origin/worker-module/same-http.no-redirect.http.html": [
+   "ce7fa2f229884001cb5c4f785736ba3062292de7",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "811265f11cecd9ca5e83c8ac4c51bd1f29c14d1a",
+  "referrer-policy/gen/top.meta/same-origin/xhr/cross-http.keep-origin.http.html": [
+   "49168ce2fba0170cbed920155bfd4e770de65d20",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "254a29152f87e95359fffd4749b2c625d379c3d3",
+  "referrer-policy/gen/top.meta/same-origin/xhr/cross-http.no-redirect.http.html": [
+   "0f6ad03b52f600cffea743a6732f9c64d352234f",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "f78fb878fffa6e52bd41177b219b019cb03bd482",
+  "referrer-policy/gen/top.meta/same-origin/xhr/cross-http.swap-origin.http.html": [
+   "b081fd75cabcdf1ed46b69bed5879414931b58ba",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "9c5035945c9081f4527343ba6df6372050def682",
+  "referrer-policy/gen/top.meta/same-origin/xhr/cross-https.keep-origin.http.html": [
+   "d6ce96eac6251a377e4e8567a76fe77e5fc921c3",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "4b238c0449d93ae792be3d56fd2d3640b28ef8d2",
+  "referrer-policy/gen/top.meta/same-origin/xhr/cross-https.no-redirect.http.html": [
+   "8c35488b0b4f2b184c4dfb29dcded0aa2a7087fa",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "a860c257fd7cf4566bc988827416c09dfde21392",
+  "referrer-policy/gen/top.meta/same-origin/xhr/cross-https.swap-origin.http.html": [
+   "1ef6481ad45f726000089935f99b767923beec58",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "a798c85d6f54988404b28b9afb0017dac6e8bcc3",
+  "referrer-policy/gen/top.meta/same-origin/xhr/same-http.keep-origin.http.html": [
+   "2a1f7434eb398620d0b984706634559aa8be82e2",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "3955b78f7ac922c6e05c118dd0c1c99aa675c56f",
+  "referrer-policy/gen/top.meta/same-origin/xhr/same-http.no-redirect.http.html": [
+   "4d21f0d155a065556fe369232000cf227064c557",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "f755d35c825441c134ad8b567f9283c1037a970b",
+  "referrer-policy/gen/top.meta/same-origin/xhr/same-http.swap-origin.http.html": [
+   "2db9e9aae41bfd9c53183e8804770da31102d64b",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "240a3c7f186c06a8271ed65e4bb9a868cf24f92b",
+  "referrer-policy/gen/top.meta/same-origin/xhr/same-https.swap-origin.http.html": [
+   "c38435bd25c4a9e1af2cc98a425f74250c728dd6",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "8d18e84cb76041841df3ca418d8c63f023c38424",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html": [
+   "9b79a324fcfcee738da044c448e3bdde7fb02f4d",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "38edd1b85df4ba87ddac07869eac39e9123d9a99",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html": [
+   "5e6b89694ddf61bb4a6b37abddf6d6a6536b446f",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "95f4a17a2a762a1dbdd65b5a6c85899923269d6c",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html": [
+   "a215963198039a541ac50cdd65572767e27d0cb0",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "f80ba3759587e78087833d49cc28922a3020b9f6",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html": [
+   "e47bee01a5ebd9b2623271262447115e9d61c111",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "ed1b8c033be379b88933ea8c070194a9d0464ade",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html": [
+   "87e7a2fa1139228bc9745ad250dce3816e73933a",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "050eb6a3904a4dbfcbaa5bff5c4b7a04c5cee3f7",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html": [
+   "cc43a46b9754b7949cf6f56d79feee2cc770efca",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "143f3f7c87a289c9dc0c673dacbbc537b43f3a36",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html": [
+   "8d5fcabef9044438e105d0e27f9eb14a8f7df936",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "ffc8190298064e81a4c3bc0ef0c3627cc83375a8",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html": [
+   "ac1c025ef8fd6ef845abc5faa5ba50f4c4b3f3a1",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "5d8be2bd928046bc40f74a14484e1bbd2f608ae8",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html": [
+   "489f5774d9de3b56455b28308ccdbc97b050f52d",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "7ceb389b35b5e21b63fedd186ca8583d5c7c66ff",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html": [
+   "765f0bb942067d74d5526655f4e65d14a1854f30",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "f3f5573b7582ec9cce17345415f2df932a829451",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html": [
+   "8752c9a74261d1d45b6aaa9d045573f7b22df035",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "55edfc9376002b493f8a271fc7a5d62c27748802",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html": [
+   "07aebd3a6349c8918e320ec11baf07b14870e551",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "902fa3341a1812c19d8091055333bee7993745a3",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html": [
+   "b466777451092f884b6d4c35882ff1b3baaa83ee",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "bd278695088c2cfdd5d028903cfe94f216d8114b",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html": [
+   "bffd18d59d5b8f42d7fd5bef71d958fd0ca6636f",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "331f865afb25e0066d4fa4861126931693eb0404",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html": [
+   "0ba113edbdc30d4aa70c2f5816cab2a26af58e89",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "b26af2a076cdfdab3c761264efdb65452f32b7c1",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html": [
+   "e735928761490ecef87025c1775c2d181ab10c53",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "0d7bdf20697948d118f95f71f69bae85e02151f6",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html": [
+   "e8d8b617ad0464ca3baf9b36527f082ea9636d50",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "1360edbceff54f3bfa446af531db26a377ca007c",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html": [
+   "d961eafb7fc8d73d1e10fee9fda6364de970d2ca",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "2f99fa632176959bf717ef2a4eb6e3851c99d264",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html": [
+   "fad227d9b3bfa6cd80ea3b2b35d5dd487fb662c2",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "f69c1341e0992a2fc3f1306c5cc3c795395e550f",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html": [
+   "04941be8e609fdfa9677aa72aafb4e664e33f9f3",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "e7ea376cd142a551f3178e35389c9f28e83224a4",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html": [
+   "d060ed1e12d2cbaa324b25981424bb93382cb8fb",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "859c7267ad547066506e11518ddfac7ebcf16b1e",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html": [
+   "9fb1fe3b6ca95d01084d7ebca8c2f652997e2871",
    "testharness"
   ],
-  "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "747c8e1059db4aeadb3d99fa855619e522d8b225",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html": [
+   "83146badd7f6b53aaa05203ffa1dfe172812a8e3",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "9aa77a78c63ae46e9fc13923c66f3d77c1b8e7c3",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html": [
+   "542d4e266eb66d02b94d8648bf00f53690632770",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html": [
+   "c076fc85e271074ed2c28d8f6fe73afd399cc9e9",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "0db6b0fbc2eec5daf60008dd4964cb21562202a3",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html": [
+   "88ad2099aa19b335a3c2a2f0f734014725976709",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html": [
+   "f72a238f1b06c62db51514909635a24cd8d0d98e",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "95eb256986e7a6d136f67b50618f9e350a1e7a1e",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html": [
+   "7086dc263bcfadb7a3302841b163e7b0606466a8",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html": [
+   "374e670f2eaec38b2a23362a9a343fe2cc6d5088",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "59de544a1c0a68ac1bf3fd62c490e905f232d6a7",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html": [
+   "e6a4a1cae8361560c75178274777ab0fc6ee5b42",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html": [
+   "370b27bd52c9e72103c954e95c0fa749711d73c3",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "42dffc718dd65acb4d73bb210411e578c5be7bda",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html": [
+   "378e4373ddcd8d824337115b387dbadc868bd66b",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html": [
+   "e1fd5deaedfd4915fb4ef60008d9e6e2cf272737",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "a1c0ad2ecbd2a5662f2fdb5bf526ad349cc7b79a",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html": [
+   "06b54e84a106daecac86e9061f5a3696c31a1ca8",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html": [
+   "dfda8a029c25cc67c911cb4db30f14170f795cf5",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "4214ed39789ce51abfee360bbe79f4f4a796b2f6",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html": [
+   "09065d9a990e069dc013f637a42f95ee9de8f4e7",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html": [
+   "795b1a698b07e4bef8c3ff86d7548c6ff3e10355",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "c74fdf48aa7204d5d0d0b759bfabb407020cf2d2",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html": [
+   "704f1cfab82a2467f27da047ed398aee0f5286d0",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html": [
+   "8dc9c49ef914632ed0bd485f81fbfa4cf10f8294",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "d6c256cdd00de76a5b4f9e50836da6568a34a7f4",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html": [
+   "0d782a2f3e5800d5db1c46388feb842fb2cbca72",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html": [
+   "00c95830a33881d207fc4a6b86ed351cafb0520b",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "84f50a7242b27c3c524fc10d6ea9b95b1e86d98d",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html": [
+   "4634152ff50a640040fe9cd4cdc3b2ff510ac6ba",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html": [
+   "ef5004a926988069f7c0444c223805a309d0892c",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "a4c9484c8c0939098c6c16683f804bd568bc8320",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html": [
+   "e66aad43404c3e6b07db967d2eeaed24d7bc1847",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html": [
+   "39a5950384885a51ea076fa6be2a6c9014e58519",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "5ff5761550074bb1beeed4e66a68bd8631c260a6",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html": [
+   "75dc714ae3b487362ab177f5c4d22616be353f7a",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html": [
+   "ca88f4bd3a351198405ea9501d62a94a495ace08",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "214d0a41e68e9e0757023a9a1c4c8776622a3bf8",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html": [
+   "11eef668cf961ebbe4adbb4b38c52f63c6191123",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html": [
+   "657c7d09ca4ad3faa1c27b4e94c200babd7d61ef",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "21f6bd1faaa7942e3ca68592bdf753664f94eff7",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html": [
+   "d8d3a81e2ba15dd2733c1408a935e5b604535517",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html": [
+   "98c953b11fdcc5ab13a418bed44a39ebff6b285a",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "a7054707dc49b7f3c6b44dfc0fe977e923c35271",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html": [
+   "26c1f00dde2204f950eba5232165ecd10522b8c6",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html": [
+   "798f6fc480a50b9ffe555dcff97725affcbdcf53",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "62dbdaff92bf0a0151424bdc0183ecc123c61db9",
+  "referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html": [
+   "2f861ecf84f58860a07b6eb785b43b3d2cbd5a88",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.keep-origin.http.html": [
+   "86a8cf5916aede3dcb156b2c82e64c7d34f1781e",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "3877d5bce4f2c550ab74d46be30b7636231aeaec",
+  "referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.no-redirect.http.html": [
+   "7165df9b9a29a19dc24de50bfac7b2f8df410a45",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.swap-origin.http.html": [
+   "eac9d1e3e32b60ae4a19b3d8a26a10e834f8e6ce",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "b537c0352c1ec175e407b56546b5b3c0c58010a5",
+  "referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.keep-origin.http.html": [
+   "5baa5232bbc26e33d39d89a72ca1590e3091b2dd",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.no-redirect.http.html": [
+   "386451d9d506687e63c3757ea771767729bf6d35",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "0881853070c54031398ca6fe72cc758689323e05",
+  "referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.swap-origin.http.html": [
+   "0ff2d30e0a3b75b88de6d5f687a82d363e50cc90",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin/fetch/same-http.keep-origin.http.html": [
+   "698db2d282fa6350c84a681d058cbe70453e23d6",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "390e5a114d0444a898b9de7e778156dba96bd530",
+  "referrer-policy/gen/top.meta/strict-origin/fetch/same-http.no-redirect.http.html": [
+   "8db97af5364fa64efb1879abb1c11539701e951d",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin/fetch/same-http.swap-origin.http.html": [
+   "e86ce77b4a800781c0909e2645ccf1f9b80071c1",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "21ec099f4cf197b93a1c08e033bd0572922fdeee",
+  "referrer-policy/gen/top.meta/strict-origin/fetch/same-https.keep-origin.http.html": [
+   "2e486d4b7dc5d300b0ba1122c3d0df069e258571",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin/fetch/same-https.no-redirect.http.html": [
+   "940d3b30e4217e5af1a436455b202ce5437a4930",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "9c05e66587adada8b50ec5597f2a82d19be57a9b",
+  "referrer-policy/gen/top.meta/strict-origin/fetch/same-https.swap-origin.http.html": [
+   "c33feb0e35f3bb1da9c37897ed7f7ff3d49e8bb5",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.keep-origin.http.html": [
+   "3107b816c5bed6b17727b2d63b0c1a7537a32111",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "2bba3d1b95809764f91de476020b39ca0e4a716a",
+  "referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.no-redirect.http.html": [
+   "0bdc08686310ef0c354916412c58c79a7b95f1d0",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.swap-origin.http.html": [
+   "6b63d1831ff11bd991dc0400d4e942dcd7c8336a",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "4e46c27514d5dd3e28bcb830a634a8c824ba7a11",
+  "referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.keep-origin.http.html": [
+   "0ffbbb95fc532f2fdca7560bf2cd3957c73ba0c5",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.no-redirect.http.html": [
+   "0ccfc472390a818061178769d86f06c955a618c1",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "43b78c36946e2506b47ec60d26595304a555c8c7",
+  "referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.swap-origin.http.html": [
+   "d6c376a4e65b9dcd5a8f8874bdd1c1087a0e3287",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.keep-origin.http.html": [
+   "2d40b45cc0038d4b53ce7917e42b738127d37016",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "745f65c04883c123f7dd0a86e4781435888168af",
+  "referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.no-redirect.http.html": [
+   "f7f02844de2bf8a20ac416982882cdc2afbbdad4",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.swap-origin.http.html": [
+   "3bd77a1c6330a4c3f1a64b513ec0109f07378b1d",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "e503b77b05c71dfe64fa5a874e1132e4ba367df6",
+  "referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.keep-origin.http.html": [
+   "ae494dbee4926858e455c781abeccb6c4234a6a6",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.no-redirect.http.html": [
+   "8d9b5f4d3d95c2376fecdeb8c6b326b13f89e0cf",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "9067040bb8622050bb11aa1919251e4063e4f2bb",
+  "referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.swap-origin.http.html": [
+   "0abed4587638b8a9cff2d390068cc2774f0831e8",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.keep-origin.http.html": [
+   "eaf16c30210357a1848c014c0a772429d78474d4",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "7b2f46326a302c1d10c304178e399773d07dc4b4",
+  "referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.no-redirect.http.html": [
+   "1488f50aff803cbd2d89cf496bd3f7ec4b8247c2",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.swap-origin.http.html": [
+   "b61faea974ae74efcea2ff1e3234960811b1ee90",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "e471c1fb03069882b4de35f86ac196a53dcd0f9b",
+  "referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.keep-origin.http.html": [
+   "4bf90c5726955b0b8e3018c90e4f9fec34b33a00",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.no-redirect.http.html": [
+   "eba80e2a1efb1e8dc6cc40ce90d1cb9cadb02fa9",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "dda3d2fb493e73e2541f012c4af51550d59b9bd2",
+  "referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.swap-origin.http.html": [
+   "b38f5ba075ede9680644128637b2ade62130b9e4",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.keep-origin.http.html": [
+   "63bcd9f654cfcfbce720649cda4f3e725a3bbe9a",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "5e3c7911cd73b6066983927852d0eb328161e305",
+  "referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.no-redirect.http.html": [
+   "432125bc00526e0810f67afeb1728240fa79c47d",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.swap-origin.http.html": [
+   "c47194b15ef4b8b9005c9a25ec517be28a83c2b1",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "3449a347dca51f652a994af3db05e877f705f2ac",
+  "referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.keep-origin.http.html": [
+   "bf42bba75f230ddef3ce515a9ee6f92d0fcd38af",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.no-redirect.http.html": [
+   "a7195a0f8f2389a11771fcdb1b7d810c76803dfd",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "d68b3f0d60b9f137047dfbc48af0e6f9a09ae61f",
+  "referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.swap-origin.http.html": [
+   "b4119eb7c42add564e78fff3868cf63372aa11a2",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.keep-origin.http.html": [
+   "6b00a6bd35a505706b2a9d6d2861e4e67c5defaf",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "0d32296e8fd1391e1223d9315efdc21d30935a5c",
+  "referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.no-redirect.http.html": [
+   "3d57f36d4793cd1c1b0bb92798d32c9b241fae66",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.keep-origin.http.html": [
+   "8360ff528ad9ba2bb53720c71692d9582aefe000",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "e0fe2ed9ecaab4378e4309328283c655af085ccf",
+  "referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.no-redirect.http.html": [
+   "35243d8c0dfad93ee7aa55e083c8600eeccaff00",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.keep-origin.http.html": [
+   "5292a9f479b27c8d897db580722487b6c3b6f83b",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "5a66aa2ca700aecaec7fc41b9546e71987d829d8",
+  "referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.no-redirect.http.html": [
+   "9f6cb30717fce29b903de0b4d5ed21a6b0e831aa",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.keep-origin.http.html": [
+   "20be1ee2d82239f79459171c6e6438dad45254b4",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "228473d37a404376a6dcc5e5e8fe12b6ae4798c7",
+  "referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.no-redirect.http.html": [
+   "fd280355417e02626fadddf411aadf989ed494eb",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.swap-origin.http.html": [
+   "878d1b0c28decf0553142e39fd672d3d08244e62",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "556a260ea63ccb66e1f2bec2faab32f8ce50c0b6",
+  "referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.keep-origin.http.html": [
+   "5511aa6d54fed581ac9805af17b89bab5d362f97",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.no-redirect.http.html": [
+   "ff0984afa87f0bec4a1e226b74e5bfa5cf86945d",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "e9f49f4ed9a67a4a7d0a96cd9daceea6367c95ee",
+  "referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.swap-origin.http.html": [
+   "6381e3025fda11d8a001c1592744811237ab4872",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin/xhr/same-http.keep-origin.http.html": [
+   "236eab003ffe9a1bede6ee662e965bcc8b8fe645",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "e225adb44b66f6a1d43c8d1015cfd68e92ef2c14",
+  "referrer-policy/gen/top.meta/strict-origin/xhr/same-http.no-redirect.http.html": [
+   "c47edfd188140a44375dc1e6f7a322c2fa3cfb3c",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin/xhr/same-http.swap-origin.http.html": [
+   "5f4e9a08c8300af2cd2cde30cb77f0d46112970f",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "a2a97e73d1e6481ef87ad68d7e8d7a2742f0a1ec",
+  "referrer-policy/gen/top.meta/strict-origin/xhr/same-https.keep-origin.http.html": [
+   "28192674c920d5ecc217e704ad6cafeb1e322347",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/strict-origin/xhr/same-https.no-redirect.http.html": [
+   "02c868a4672324816ba681a69de3f0a97dc41845",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "eae326f66c1a7127351a8efd952e4a5a1cf622d3",
+  "referrer-policy/gen/top.meta/strict-origin/xhr/same-https.swap-origin.http.html": [
+   "20f964044e23c3da3617b862e57b1c8b73dfa0b0",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.keep-origin.http.html": [
+   "383a91559b3aae9937feccf2aeefc290db9efef3",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html": [
-   "870b555c7b4a90c539871ca723223fe7dbcbed18",
+  "referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.no-redirect.http.html": [
+   "3a7df294f9a3074d18b36b0c12b23585d00dde7d",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.swap-origin.http.html": [
+   "557684095b16492465a31b7e542d50d79f5d8e18",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "92186b3831859d4790934a416d90969e276cdb03",
+  "referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.keep-origin.http.html": [
+   "85a20c12d9752c08187e902d375c9d1512a896bb",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.no-redirect.http.html": [
+   "0c058c0832fd8633165f270308cd7a3d8ef8f823",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "924ebe5e76c09cc21653daa2aad2761424feb3af",
+  "referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.swap-origin.http.html": [
+   "91884c7afe6e31dec7a601fe507a0716c9832385",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.keep-origin.http.html": [
+   "ad39013c5f340b9fe255f811c4731a74048305a2",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "8e374ad73ae7a89a638277ec6673fbaec28c5f49",
+  "referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.no-redirect.http.html": [
+   "2bc73e76e68b2d8475b818d7a452b1726956723f",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.swap-origin.http.html": [
+   "7a69b5297890c8881109eb29e91086ec1c7ff4c5",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "698ba1f52dcf16df370f74479624d6ecbb2485cd",
+  "referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.keep-origin.http.html": [
+   "4cda477b772c90dac479da81d32ac927ca2197ec",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.no-redirect.http.html": [
+   "ed261048b3801a4d8f91d2328f8ed98a30cf784c",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html": [
-   "c3eead4ac0ceb0a2447734d52365928daeb949fa",
+  "referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.swap-origin.http.html": [
+   "cb5bcf637be9f75e10354da6b64dd4a6293bc3be",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.keep-origin.http.html": [
+   "5e9376358b9b4a3d5cbf6eaea61ecf298bcebdda",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "b1c1f720a14e75c34fe82b3fd647241f86ad3137",
+  "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.no-redirect.http.html": [
+   "50532da8910378c3b29c7bd520ac5f173448aee3",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.swap-origin.http.html": [
+   "4a6fbf0d03a627d4c82e58b296b00c05243cb67a",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html": [
-   "f0082510aaf9867fb2b4d4f36a5a00f9a4107553",
+  "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.keep-origin.http.html": [
+   "f20be36ad1c27a26e3e33682241cfa6bd7c2f114",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.no-redirect.http.html": [
+   "1925370c86b81049450b15ca6cd3196fea3d2a70",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "dbb8da1e03c956fbaed72688e090e80d3bc33ff9",
+  "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.swap-origin.http.html": [
+   "4474708caacaeac71ccc7da1135414ae22699cce",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.keep-origin.http.html": [
+   "ac6bcec6450393d369327033ac83b2092cd8d7a7",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "09aeb8fc143e6d5df4fbf362dc07db6c1e4f25e1",
+  "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.no-redirect.http.html": [
+   "a6364188266e3f29f2ff6bd9115dbc1ef41d361d",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.swap-origin.http.html": [
+   "4b7889385bee894026736f7329490a72d16510d9",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "e2f73ada79c33932dc87aee17a81deceb1ff2e56",
+  "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.keep-origin.http.html": [
+   "0bbc78707db66389124272c8983a00e706566e2f",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.no-redirect.http.html": [
+   "63d3c37d89a560bfb82cfa3cf44cf65d5c2d25b9",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "fb86bc5c45fa86aea0caa61611cc63dadabfea7d",
+  "referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.swap-origin.http.html": [
+   "af08f36ef37e872dba30338eeccd4a5a42cf6b31",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.keep-origin.http.html": [
+   "95b58fa5d651248048f5edd519a1a99db973f9ab",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "637f7d801961f4351d3eeb0a92b498007ff766d3",
+  "referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.no-redirect.http.html": [
+   "f70dab3d46abfec6a251bca7061b2687e4d0e5f2",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.swap-origin.http.html": [
+   "e5dbfb16d0d4c13c946faafbc5798b78235252ca",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "649574394f1259b62aa93c5eb7d376009a4f3111",
+  "referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.keep-origin.http.html": [
+   "b740b81c25802a88402b4d780b10901aed98359f",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.no-redirect.http.html": [
+   "dcc34b6ef19659e5a6b243d5af22718c03820683",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "1bb79c1f38afa280cd1193734bfdcca3f63938bd",
+  "referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.swap-origin.http.html": [
+   "bc7ee4cce9b4e34368746cd62859dfd1fd7d35cb",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.keep-origin.http.html": [
+   "052c6cf287bba3b35e5973057252627580aa1d00",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "a9053cc0649c374c5c00dfc830ede7c2627a4dfe",
+  "referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.no-redirect.http.html": [
+   "acd64f240b9458eda751ea324b511181879462d9",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.swap-origin.http.html": [
+   "5553fe06a0a1489c7ecda14b99b96eb37e872756",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "c7536fc50807828021f58f58fcdb94b0baab4848",
+  "referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.keep-origin.http.html": [
+   "ed63b00877cfa77bf3512221067edd87dafcabb1",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.no-redirect.http.html": [
+   "9dd6c3b3b52e041dc9d35fd9e805693aeaca47aa",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "b27ed1830b6174ff7f372485c48bb866eb4a26c8",
+  "referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.swap-origin.http.html": [
+   "d46b65c5d6ed487c1ca7a8e0a3b3face4ffbd786",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html": [
+   "04c02ae47efb6ac4945f3b011587a904cc98d203",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "39a7b701c33ef86a4ef2c8843654032132469828",
+  "referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html": [
+   "83b4baf0bb3f165fa43698c38679cedbba6c06a1",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.keep-origin.http.html": [
+   "bcaf210bc4ab48791e4fee5bf383e165c78aa911",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "27f637f8447dde6cd24378d3e0799876e8d79241",
+  "referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.no-redirect.http.html": [
+   "7f3fd250721b3fa6b545fe316c62bcdef346bbd8",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.keep-origin.http.html": [
+   "01bc2a61fae0190ba34b1b7ca01980dfa8bd87c1",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "3c11a22da1c4e7c3eacddde233b7b763701bc550",
+  "referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.no-redirect.http.html": [
+   "5af7f8fc21ade640000423a854a1cfeca4868a3b",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
-   "support"
+  "referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.keep-origin.http.html": [
+   "77aaa8793129bee4ae171936392a16476e027612",
+   "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "b02da368869d034ed36e33d9b33dfc427bf02522",
+  "referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.no-redirect.http.html": [
+   "6e1b01962179d6a145bd74bb959eb0fda7294786",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
+  "referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.swap-origin.http.html": [
+   "bb955ba76566e5fa915314ef65b4c921980fc65e",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.keep-origin.http.html": [
+   "21f65dedfd353406e9551ab493e72cd6b0ca0950",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.no-redirect.http.html": [
+   "b19fa390d20d151a0d137dc567612ed36ca6bbc1",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.swap-origin.http.html": [
+   "43fa7e0286e01ad71bdd9f07332b853d73eaab01",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.keep-origin.http.html": [
+   "69d157e43a95add0742f3a85e16e810698efaa52",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.no-redirect.http.html": [
+   "f481905747b10d664e3d318ad69408d60dceced6",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.swap-origin.http.html": [
+   "b359aeeb63f460eb9cc9c5e41adf74914129f2da",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.keep-origin.http.html": [
+   "eb14cf0a1959407d5e95f13ec50bfb170a8888e3",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.no-redirect.http.html": [
+   "d46b4cd5c2a00970222959fd83df4e0f172d2ef4",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.swap-origin.http.html": [
+   "189c6bc5144eefa32fddc7b57f58e575e6a8aaad",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/fetch/cross-http.keep-origin.http.html": [
+   "ea2e8d1194859594c01f573e3f3ce5818566a9cf",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/fetch/cross-http.no-redirect.http.html": [
+   "2cfe2a0fb99b9b83770be5ea0347887437cab561",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/fetch/cross-http.swap-origin.http.html": [
+   "44501a5f736380a6c6a3e879bddfbf8aa6f4f90f",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/fetch/cross-https.keep-origin.http.html": [
+   "9f51a70045663262f724914650eeb93b92551a7d",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/fetch/cross-https.no-redirect.http.html": [
+   "b16692f66d4ad8094cff6c778242afaf819cedc5",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/fetch/cross-https.swap-origin.http.html": [
+   "532809dd0afa8fa7cf20e93572ffe3068482a768",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/fetch/same-http.keep-origin.http.html": [
+   "99882a623ccd727407e4fadb666994f615afb93b",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/fetch/same-http.no-redirect.http.html": [
+   "aae08809fa202d2d0dafd7fb8b11802f56b14dab",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/fetch/same-http.swap-origin.http.html": [
+   "b8dbbd6e029ff40110d6d30bfd013201edea9b6f",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/fetch/same-https.keep-origin.http.html": [
+   "5480d46ff3f05aa804e2386c755d0afe3fd2ee49",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/fetch/same-https.no-redirect.http.html": [
+   "0edaa41c1c8237df53d6c4e2cfe3654aa0b36d2b",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/fetch/same-https.swap-origin.http.html": [
+   "2bcb3cbe6ec3e8f8102f8a5eb4e4a92e53f91476",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.keep-origin.http.html": [
+   "97ec687004a41a5aeb3d8d7d06c3a3e5a36db20b",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.no-redirect.http.html": [
+   "d631a6dcb12fcdac7bd6cac94b67893203ae805c",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.swap-origin.http.html": [
+   "2d627c6d22edd82ba71e776c85cd7ff9981f6db0",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.keep-origin.http.html": [
+   "366e8665a62e062ad5d44f079d0585d353a38d9b",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.no-redirect.http.html": [
+   "3a55660c0e48d19afd0101e29b9b7b09013ba7b4",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.swap-origin.http.html": [
+   "9b857831f09986428eea878ff03d33981788d4bb",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/iframe-tag/same-http.keep-origin.http.html": [
+   "d80ff5a58075f7a0cd469da0d9ec0587172316cb",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/iframe-tag/same-http.no-redirect.http.html": [
+   "012d095ef49377e0c7bf2ebc6e12efd8aed5dec4",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/iframe-tag/same-http.swap-origin.http.html": [
+   "f2f4595415a3c912da6fab0b144373651393c91f",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/iframe-tag/same-https.keep-origin.http.html": [
+   "667567ebba11259e988613adc3a040269a927abd",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/iframe-tag/same-https.no-redirect.http.html": [
+   "2824cead304141079f73bedaf9655ed5406d34c2",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/iframe-tag/same-https.swap-origin.http.html": [
+   "9efcc95c2aa98335f7613d6d2e53c2550defe471",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/script-tag/cross-http.keep-origin.http.html": [
+   "e49bb460dbab8b926c3eee0e8e6e0040c6fec870",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/script-tag/cross-http.no-redirect.http.html": [
+   "cc431565cb16ac0042be8eb61b37c02c901b2314",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/script-tag/cross-http.swap-origin.http.html": [
+   "acba24bf6482e9208b25e9fdfedd9d908f00002d",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/script-tag/cross-https.keep-origin.http.html": [
+   "6d335a915c88ebfd502e7a7edec108468ef52ba0",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/script-tag/cross-https.no-redirect.http.html": [
+   "a72d9f9d555eb60ee0e7ebbc9fab32a1d3230fe3",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/script-tag/cross-https.swap-origin.http.html": [
+   "5ae41b8a4757fccb99c9cb44059b34cfc4370da4",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/script-tag/same-http.keep-origin.http.html": [
+   "41d2ffbf3bb9f94ddba57b8f91ff4b6937797ac7",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/script-tag/same-http.no-redirect.http.html": [
+   "c50346186988fd0f38d4c858493c667d658f06bf",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/script-tag/same-http.swap-origin.http.html": [
+   "ccf74bfc9783b89ef645e64dd6b433f2976e4ef4",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/script-tag/same-https.keep-origin.http.html": [
+   "1f3c30737f984e230f66b8951b1efc83602180db",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/script-tag/same-https.no-redirect.http.html": [
+   "8b7f117bd904e95890d417f6dd772dcba17b956b",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/script-tag/same-https.swap-origin.http.html": [
+   "de7ff149fad8eb3705adfd9d32af4066563bc9e6",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.keep-origin.http.html": [
+   "bf5fbd15347c0589d84cf150d64da32e551b9d6c",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.no-redirect.http.html": [
+   "019f99b85150aa1da20a9bffefe9fa81338be86d",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/worker-classic/same-http.keep-origin.http.html": [
+   "bb03d60a754c84ee3ec4f530ebc1e2af7230dd08",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/worker-classic/same-http.no-redirect.http.html": [
+   "2647d9c0068ca57d5070a0d503748e4d391a7e9b",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/worker-module/same-http.keep-origin.http.html": [
+   "48e9b2fc797ce1bedab11017c450b4bcdc3b7075",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/worker-module/same-http.no-redirect.http.html": [
+   "c471a2ab65f0027b09a1156a7f9fcba6429c8fac",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/xhr/cross-http.keep-origin.http.html": [
+   "d05cf044d6b27de6fb4b98e67aef5b4ce547298d",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/xhr/cross-http.no-redirect.http.html": [
+   "a46b1806e1d9c4db2f95f0fa58b2b8dad6dd1a62",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/xhr/cross-http.swap-origin.http.html": [
+   "bb3472038d3c63f0eecb5edfbc8f524a812c11d1",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/xhr/cross-https.keep-origin.http.html": [
+   "d7ff137270e823c1a2f2cea7a12bee20beb2ecc9",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/xhr/cross-https.no-redirect.http.html": [
+   "d2fe3e21cd9298d7c3509dff0c9c8f1f8281d37e",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/xhr/cross-https.swap-origin.http.html": [
+   "5646eec59885411e0af515d96f8c34024d2948eb",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/xhr/same-http.keep-origin.http.html": [
+   "67e588307b53ca28c28c9b3e6200b69b1e5f129d",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/xhr/same-http.no-redirect.http.html": [
+   "e165cb1f414143495575599ed9f858f16c1e57b6",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/xhr/same-http.swap-origin.http.html": [
+   "395832acebdd6263ad535224910868beb89cca31",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/xhr/same-https.keep-origin.http.html": [
+   "99224b7cb6b6deff0b505eb90e71434fbc5c8fe8",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/xhr/same-https.no-redirect.http.html": [
+   "a2c89524c97aafcac94308f9517379a90f87a0ca",
+   "testharness"
+  ],
+  "referrer-policy/gen/top.meta/unset/xhr/same-https.swap-origin.http.html": [
+   "d868323f574937678d6a273346d62421c5cee6a9",
+   "testharness"
+  ],
+  "referrer-policy/generic/iframe-src-change.html": [
+   "15202a76a1ea3b7ad8deb35cdb33826414d7a95b",
+   "testharness"
+  ],
+  "referrer-policy/generic/inheritance/iframe-inheritance-data.html": [
+   "06c3c9b0c4bcf4297f903d422110c2de420679e3",
+   "testharness"
+  ],
+  "referrer-policy/generic/inheritance/iframe-inheritance-srcdoc-child.html": [
+   "08acb405c211e4cf84ae6565a84120ad45b0271b",
+   "testharness"
+  ],
+  "referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html": [
+   "34ea0045b4871d97acc9b9359e7920c7e04d8c59",
+   "testharness"
+  ],
+  "referrer-policy/generic/link-rel-prefetch.html": [
+   "914ddfc4b225d26c675c61ecf623fdebb10e4524",
+   "testharness"
+  ],
+  "referrer-policy/generic/multiple-headers-and-values.html": [
+   "d4826ce8a7ae2b40898a598c36523d9520c54b4c",
+   "testharness"
+  ],
+  "referrer-policy/generic/multiple-headers-and-values.html.headers": [
+   "d1acc2f1d3cbce700865d96937e612c56e075166",
    "support"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "5f542a4c16c40e41e9de08b57c7408ceeeaea293",
+  "referrer-policy/generic/multiple-headers-combined.html": [
+   "47b59f556614119ee1dfba56e6673a652a725868",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
+  "referrer-policy/generic/multiple-headers-combined.html.headers": [
+   "fc30a2a18627cf0cb485836f8d44f45beca510f2",
    "support"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "a5a9a71c2d1293d883bd75fbb4a7d695b3f772f1",
+  "referrer-policy/generic/multiple-headers-one-invalid.html": [
+   "9bd661fe6a247809f1e8b7ee5ccfdcadad0f4edd",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
+  "referrer-policy/generic/multiple-headers-one-invalid.html.headers": [
+   "075219380414598f4535faa973fe69468fc7d37e",
    "support"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "be363d79516178fa0509bae76c473f7db17a9bcd",
+  "referrer-policy/generic/multiple-headers-one-unknown-token.html": [
+   "7c28a5ada5273d94ac07ca2ec182c06047b9a560",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
+  "referrer-policy/generic/multiple-headers-one-unknown-token.html.headers": [
+   "46feffd705fe0e559b6f80a4a6b7f7bc46b26121",
    "support"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "04e317062aa1218243689421a31560faf5caf47a",
+  "referrer-policy/generic/multiple-headers.html": [
+   "7f0364f1853f65cb1020af53bbeefcd6f44b0011",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
+  "referrer-policy/generic/multiple-headers.html.headers": [
+   "dd1dd853f2030bac5c036f693a7cf0eca6daba1a",
+   "support"
+  ],
+  "referrer-policy/generic/referrer-policy-test-case.sub.js": [
+   "4722b0b1b8b373d4bc9ae4c7c41912e693dd9d1b",
    "support"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "3504c73637c8136b79126efd6aa90883e42c2b31",
+  "referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html": [
+   "0e8e5e1306f5f51c17d8a89c92bb86573c3e275e",
    "testharness"
   ],
-  "referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
-   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
+  "referrer-policy/generic/sanity-checker.js": [
+   "e296ce93b965b788ea79f2f2b6cff45d5dce55f0",
    "support"
   ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "597f4092c2f3160e82176f549fb8507c13b7eb17",
+  "referrer-policy/generic/subresource-test/area-navigate.html": [
+   "ad49c0c2efd7ef18070a73caafd9223e1ec3b39d",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "2177b2407fbb4483669380b6a65ade6903d381c2",
+  "referrer-policy/generic/subresource-test/attr-referrer-invalid-value.html": [
+   "bfdf1166ce7876c478b4cfcf9dab439d04a7e437",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "54b2947dc663bd502e8e6f14bf776705dfbee644",
+  "referrer-policy/generic/subresource-test/fetch-messaging.html": [
+   "2d835274c132591a8edc574ad747e7d103de0659",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "94f10a8e9de329b47ef0aa8697d2b2d45c0644be",
+  "referrer-policy/generic/subresource-test/iframe-messaging.html": [
+   "2f97ce4c62a8dc96c886e17b9113ee9b7c021174",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "9463f5394adc5383a4794cabce68d5141838827b",
+  "referrer-policy/generic/subresource-test/image-decoding.html": [
+   "97abb153f1fca19eb53c280117120299374b1b6c",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "3838698b0a80061e9b32c520cc75e502ec06aca8",
+  "referrer-policy/generic/subresource-test/link-navigate.html": [
+   "e96fd22539829ef2f71053517941eb3a8178d167",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "5a1df9c256b35011c07d43587e2dab8a5bbcf218",
+  "referrer-policy/generic/subresource-test/script-messaging.html": [
+   "44c938fa6e1c34b3761ac6a797d2e87a319fc08b",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "0fc489100e8d6d74055f7e91e7eca68ffc8318bf",
+  "referrer-policy/generic/subresource-test/worker-messaging.html": [
+   "0612e9965983c4ee696e63be71dcdc31981aa31a",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "0028b48d0b7e97f404b3c532864d01671d709286",
+  "referrer-policy/generic/subresource-test/xhr-messaging.html": [
+   "8afbf1db237130d6c8258b755ceac5258f6500fa",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "8b2dea1cb62f4d5fd0dfdbe22617e9a9997a4046",
+  "referrer-policy/generic/test-case.sub.js": [
+   "356f8054f6eca86f7e6f651ab1040ad0c39994a9",
+   "support"
+  ],
+  "referrer-policy/generic/tools/__init__.py": [
+   "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+   "support"
+  ],
+  "referrer-policy/generic/tools/clean.py": [
+   "715e1d6ae4b53461a99b3789a5200e4cb6456f4c",
+   "support"
+  ],
+  "referrer-policy/generic/tools/generate.py": [
+   "480603b9bd870d3e1abd577de31f3f6192caa2e8",
+   "support"
+  ],
+  "referrer-policy/generic/tools/regenerate": [
+   "e6bd63519b331b3a921755445f6895e39f7864f5",
+   "support"
+  ],
+  "referrer-policy/generic/unsupported-csp-referrer-directive.html": [
+   "0a29f38c0288c34c23eea14a6053d68d6b19582e",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "71a0b692afbbb185d6710872ef178de5987c6135",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "ea712646bb16025d8bf0e40aa98104a490a7065e",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "48861eb9bb785ed17c38fd4c52c5979d197b702a",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "cfc379c0534522e175ff0326f9aafe72d4e49d2e",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "c63d9a1608c133f0ab7b0556d4ed4d254b2c7438",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
+   "0d592b59d40b62543de7b7d2d25d55817f0bdc17",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "e2143e1a32037aca1eb75e166eff3e2b73f36f36",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "8d108c74608fad1c9765c5d6284bad72e54275b5",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "b8d84f7726cd1e40545a377fe0affe4f2be5e7c6",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "8a3731927e0f015697c5b56248a63c7345d2d195",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "4f36a9cb35765d01bccae61046ba0c77bf6e68f6",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
+   "463728a4ecd9cd592090b5be6648bf2d13251d54",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "c43e52e9dfb1b4301b6d275836c44aa5af0dbb8e",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "d5275be0409ea79c947503e825ccf11fe1912295",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "8edd239db2f7622347fd03c635ba5874efb5a553",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "21ea496ca4911832d4fd62afdde6470fb5e90b9e",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "873b26a46eb6da2648a7aa64e4a5a094cfa68f96",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
+   "c54ac62bfe9fccdb76c7897bf2b3d6d85207e322",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "f0d5c81eca2a4821352a66413f99725c4a000104",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "cdcc134dedfdc84dce7975df662466bc56115032",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "c985a4045448d0fa601b84040be702c1cec8e3ee",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "43435ff17b2900b564d7cae86b35a47752eb279e",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "9881576a69bd2a3853a1a4c120d55e3e3bddacd4",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "61b962276bb7fca9cdb6f247cbf6e691210015c3",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "203c5e73cbedd6f95b3afd8ea8a113ecd23717a2",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
+   "0ac4282fb4175860d7beb8256437bc9bcd32b4ad",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "41025c58578ab4aad59c0173077e560d0269f193",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "ad75a53979dcf904fdbf20858080192491feeb55",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "ada714dcc5088fd580daf2b5cc12e5a71233d7a7",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "0cfaedb10bfc4488d1c3824ede8de6ecd8bd81c4",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "a574b1304117a6caeea002855820764dbbca9d45",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "3ef49b93f0f6fb0101e1ecb94d1cfc42a3b15986",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "20a3252bf2ff47dc3d8420618259cf819a1a0f29",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "a060a3bcfe270df9b3da7b9cb2c50ea9b90aaf04",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "d48173ffeccb3c1d43e6ff057b8c5c7ec575bcc3",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "deb4132ab084ba1f8f0db78ca192c189de3bf7f9",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "c5a1548b12dbeb0a6c20b954058e82aed432d08b",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
+   "793166af730eab51f8c8fe58f33352c7495c5312",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "0ee367c9316bc5bc49ede92b77140f923a6c4128",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "1737e72548c1378be77074d8d4cfc4307bdeadba",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "3e6c3a175f1a8281ba7af4aa42ff0f8fe07ce145",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "57fb4a946c1897e61efd7160ef7b64a58296bdae",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "533a22a72414151feda1aa621ed9c4e2dda02fd3",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "c64034d2bbd16777ac5d20b18ae662ab59d3d984",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "335ff468d905ee397358dc7caab8dff492ce164f",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
+   "387f84c09bae3a8644ef28b0cb3db7734047b7c3",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "32aab01443482fbcb3e450f68b80e5d6fabd22b3",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "4d0c946bd7a58083be4fe854cfdcb1e7e6455705",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "a92d87e2782fcfe6b39cc7826055ed956a80bab7",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "9c769ba10d952c874289c5a7b0dce4757f201a1e",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "6f9417785ff9e3b4f7bc0359f26b534b44dc5bae",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
+   "2b1ee01973e73e5ffb1ccae3229e22d98b9f673e",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "ad8d9e7f1901d4e04d4166cd1ff37016f1260b38",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "42665670f5bb6de4d020e40aab5dea56940d332c",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "a218fb4980df724234814766a59eae7b8bfabad0",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "fa0accb2c068094a4d718f9d21b69b145072c770",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "f3fed6c88b8da176db1c51208c2bb4eddb33b2e0",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
+   "59d852294b20500d5facf71ca8f112106a0539b9",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "3675e2391e4e72c154db32767af24039b396b70d",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "e1b79bca8050de32a3a38ef93a89cbe42b9d6206",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "a94bdfa5d530d9916519262cb89aef7a1e82626a",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "f0d321a52cf5a0c3c12589701b0c1bf55db97e48",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "623f6a6e81aa33df2fb6d12a7df7bcb353c91c99",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "ceeaba32d598ec2d4ac74c2e59268b9fdf6d59e8",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "a991f0c67578b92097dbde29f508336196fd6380",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
+   "59322a856e01b891454f4b97b182e9cd217766b8",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html": [
-   "1546f57a7df782c749d7fdb0c7775f73f1bfb04f",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "ea8dcab7c7d3cbcda26f73eba6059a28a1085251",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "3877c0cbaa250e29e6408f369fe638265ec94213",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "5aa80479004486ae33c3b9cc0421db7f18608494",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "8542943aabe20b6df7979e467ed86519b0351aff",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "df88f442fab55c2c019ea63aa679328370cb9fd2",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "f688eda4732690360b8dc44ea6a2d0c227b3026a",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "8ffbd3a852caff1dbefbd463a45d5d47dbc77fab",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "aefc8786e2c2abef050f2a19ff4a5f44214f1d0a",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "455efc4ae70503796438569eeb318d2ff1c1ee95",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html": [
-   "107e1ca1a6701ee92c5d12019e7b99dfff4d6774",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
+   "89da6893a20e9b5957c0ee09b15a8d6172362cc6",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "2b4472d3554859a7a89dfb385520e2579493a752",
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "6b29a191efeddb78168ad7a1cbf4d1c5ceff38de",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html": [
-   "5889d9e90f272193f08f953e754d3d0bfa4391eb",
+  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "eedf34f796da2a92801d91c3d4b2504a5f42983a",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "2edd19df54f2ba7ec289f473370a740acf9614b8",
+  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers": [
+   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+   "support"
+  ],
+  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "7a78d49b6411187729cb7b7d9a6a9e4780d3a7ae",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "418e84a8210e0bf490396dbfadba00e600fa3a7e",
+  "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
+   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+   "support"
+  ],
+  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "0fc1d169c9a22a0f2d585dccd36536463ae34730",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "d46cf842c631c894a8ecbc2ce7db778fd8376bc4",
+  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers": [
+   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+   "support"
+  ],
+  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "93479418ab5901ffe893b8c15d543834dc636e61",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "0e40587a04020bb8526448e5649b5ff179b612c2",
+  "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
+   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
+   "support"
+  ],
+  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "14d891c6ca0a6fafb699ab3f41111d1327507838",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "538500ad734f51dbfae7bcc300a48298d91319e9",
+  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "f6755e99add4f8a615fa20645d01de2511c82563",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "58da77e1a2916fa04f1dfddee6564088c4e1bcd5",
+  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
+   "9ee1de48295f458eba00147cb56171c95e16c428",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "85dab619c2b1a7ff169112c059b44f1537483b24",
+  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "1f0b254a2a1b236b391c1f8dcaf7a95c9e9f246c",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "92c2b51d15e244d1d223003aadff7582377ac3c5",
+  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "0f512823e8e0aff1dc30b0a5502209c7f345480a",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "b981865251345b348203274fada1441c63a4f96c",
+  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "44b8145030a8405d45d1b6f8ee2289d6b6b9d997",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "20f21df56570969cae0ca0c31382690cda733f06",
+  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "dde31a65bfcb1601ad5d90fbffd44c19d9b0ce6a",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "7c597fbcec5ff35babb6219d5a22be50857cbee4",
+  "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "98d1e9812043b069927a4cce24602ed353f2cd1f",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "7ba85fb790c517f3223183557921082709f6c38c",
+  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "6a5f3c4fcc596b42e5526074503660605fd05b93",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "fe6b2b59b8b58304d4815fc6340b099e9177872c",
+  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "7784873f7f3f7d5010b5fb863a299d1bbec631c1",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "7cb4aaf09436063880bfaa8c1c44ef5e11310b9e",
+  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
+   "917c0b88847819501699fbe6ad08a051733f3376",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "e7caa27315667953491e6ad620beffcbdcb6eeb8",
+  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "a00848a63ec75e51160aefc01705414596466ecb",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "b0fc558d76ed8501d84ea42503f9989a8e0ebf09",
+  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "ebb93af5050bc08a0d6eede2fb8b83f3e9d27977",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "bac4c36dfe5aa33de300d637276d9314684d8e54",
+  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "f4bdee5ce8681848e3add2ec9836f62991c93279",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "0d76c92864d6f4530210aaf8096d67184c4671e4",
+  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "5e12002f256403ce8c705288c4f355b46a1a6965",
    "testharness"
   ],
-  "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "2b24a45ec52ba19f4bb4a9d30398edbd251a4241",
+  "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "134f342965ed71e8dbcc1d25ae265561d9302e85",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "00587b4f18a6afa814740c3148d671600e243089",
+  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "d0ab6e1ccbef74310faf625f60d9af70d72bc1fd",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "3bcc6e82a70198f0c397cf2968feda346dda175d",
+  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "8f5b1a70b2142dfb6320ae13d44c60b2cac64b2d",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "387a0b3e6d5d9412f4c00139675f6c6937a7d59b",
+  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
+   "086c8b1a047cc3ba7e61205a60206e70e993466c",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "e19734a542ae759c235549e55badf0fb64a8da11",
+  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "d0e05376f09fbadadda908b63a078e32fbd7e051",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "72eef24fef5e9131501a0959a1088053fbc6e278",
+  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
+   "74ed8a8903d259d0d87b1b3b533139f5d319b240",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "c789cf6d302b2e1acdee5cad196950f7f603037d",
+  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
+   "41a4c940c123b583128beb4108ba9b3015831712",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "a24af8beb2dbb79316b79e07e9184c14e99c3328",
+  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
+   "37879ce158dc1f54d51f0c55ed0e13e56f0fd2fe",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "a2773bfb160e4e998c5ea08e28c9824f151df2ad",
+  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
+   "7bab6eff28eabbc0d69644c50a19187d35833fb4",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "72cedc5e35c5c1a6c0eed922de72b743276b5850",
+  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
+   "b874f1970b1bca5501518450a7bb010564e39037",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "612d7b36280cdec928734d007dd7d853a52cf5eb",
+  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
+   "ce4957f92f0627ffbb6671041b6542c0f178d110",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "dca3d06299409aa44d3a8fe98b82875c7702754d",
+  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "08dd0a18a46d224e8b1cec1af6c5457ce4d58d36",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "2c5328ff25e68f4c362dee910453e7ec7323f010",
+  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "d940fe023d54829d7ed596fed8cda5494443aa1c",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "54dab293d80e500094aebe896ffed492dfefa96e",
+  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
+   "ae67228e393ee75705d7bc4ec3d5d2f1f700b847",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "9899e2f4e6b7ebb7b9b8d1afc7266ed50384150c",
+  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "edb49e27f2373a118de1577cbed512295881f4a3",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "98a55358c7e8056157192bd994daeb8c95917f9b",
+  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+   "f48a02175888868fb4c780ccd50b6912e98bf9d0",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "d5843c83a955cb9a14621405ec77fd8620aba947",
+  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
+   "795774b4006be2c6bc9a0b97ae1dbdadde07945e",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "f7d63a639ef29924cbdbab9f6f173365f2f0ec7b",
+  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+   "8d4143e4ab99b882344ef6834c6f19349d7a42c4",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "bcf8f70bbf774bf7240314da1fdcd8d24c059782",
+  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
+   "68547fdbb73d4ee73789d666e7972c543a14ad48",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "eca04d52b0274beed7eed501809302e08c2ea166",
+  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
+   "acf4458a1689b5c795a95eba30e6edeee0aff946",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "91d7ac0ab4d93b9445de7382c8ea0a7958ace19d",
+  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
+   "6f57c7c4b2b9558f11798154d188bb686f6ef00e",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "72eed78e5a241f9f6548f55812e8335fa723d784",
+  "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "e2404361ecd2bbb8706856973981bc90bb249e6e",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "7a45e12f4f8facecbf19ccc1b9735e04ba5f4ac8",
+  "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "66660f05264a01cfdce44bfd97a038779e88e6a5",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "5facb852896e54c8c399d47b72dc7a914e576ea5",
+  "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
+   "15e978254242857952ad19120cad564ef067c1ba",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "8ed4f6340056660fd25a65396d69504d4c314601",
+  "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "f5e38ddb803aa273661507ba2a42637341779fcf",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "70403fe53654d6a931f70fa05cf441e2cc574c8f",
+  "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
+   "20dfb8a3d66188260044fd662a9f3f149f074fa6",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "32dacf7ffdcd6994549e01d73bf5db33a51f72d2",
+  "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
+   "661a0cb964cd6b0b14f7a277c870bfffbd7353d8",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "433f51b14312f8de24d1c81041330a9f3dfb894c",
+  "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
+   "4705a1988873dac499172e22df4f36c344398403",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "b23ffd4b8e2ca1ccb78229d9f96a20c47b288ce4",
+  "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
+   "66310f711b537dec29306f740c8cb5f5b53da190",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "08f7d0928944cff07ec99f6133f2b2b8bfc058b9",
+  "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
+   "79be70d7587779fcfd23529c9251da339455790e",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "f5bec43c8b225ba84858532dce2336d7c09d6854",
+  "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
+   "d3a7d9627f3b57aa3e07d62e4b943dcf9a17772f",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "c1d52ddb51465285fd9b8d4099f3add98930ad47",
+  "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "4140287d37986189912e979a0a75b4e627e2c8b7",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "5225f28f85073b1733fe5f895dbce696ca2fd4dc",
+  "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "0816608f10f042d610c7c469a5864a7bd499ca57",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "e17dbf9ef6a512a37a93a0795686da06b0111ecc",
+  "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
+   "4af019d39fb30048889d743c6f9653451327524f",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "613eac440b5089f3375c9b1f542115d75ef34ba6",
+  "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "fde81606e41dcf5948de750eb57272b14a6133cb",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "dfc5328013a50d133a51e8036cecf782f7460840",
+  "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+   "930a9c1450c6133a6df2d1eea83cb9a5fa5a4022",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "ea9605e8169f523a8ceb8bcb107aec2a4147888a",
+  "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
+   "8d08d63d72816a0814a639fd708966c0a921ebbb",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "8b5e5cd9c0c39cf22d18ae05170c66e42afdfa43",
+  "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+   "dbbc89ead389bafce662b3444d7411fc17db4a1a",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "0913d31a24f697fb415b9f3613689313672cd9e5",
+  "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
+   "a190ee179384a86a74ac1ae3b901010c5a984d30",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "2b06a9ab2a2c2137c8e5dff00176abb96c3f9923",
+  "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
+   "3a1d16bec4e29e788a970864066efb681b38ca79",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "d8375c93426751069de86076316f9d9eba38e89c",
+  "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
+   "572d84007c955b07ee118f90ce179646dd9bf1aa",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "3353f70740458abee966085e45f14bc359db7e97",
+  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "c1a8a0a0bc23076f71a86da443b196a11377cc10",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
+  "referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
+   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
    "support"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "a82cc859c33540e41ca22c8eafc53f65f7aade52",
+  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "e1a27e3fbae7587f7bb8c921f86239a65a8cfcc2",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
+  "referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
+   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
    "support"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "8f57b3335ac4e61b746c644cb99d69a8368c22b5",
+  "referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "121bfdfa4683ee7197370e56e7680f7b756d8874",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
+  "referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
+   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
    "support"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "3991c32409051280eb6872e6d5b8096684a7950e",
+  "referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "3780ae41833ddd01d7bcf3e790d9b2a406601812",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
+  "referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
+   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
    "support"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "f61537ab2b70efc119200110aff69a24e2af7908",
+  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "ba1fd4a411064963389efb295e796a45cfa8b6da",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
+   "a09e04cd22c2a723fdf60bc8573bfeecc9e3f4ca",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "5dfb2f8a164bfe75de3d238b4d344e2f98276270",
+  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
+   "9981baec4babe9416ad667f22a95a34e6d8a063f",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
+   "c2a92aa157e3240e589abf87de0620682140356d",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "50010aaeafa64ed2cd7567aa5532a40762851717",
+  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "80165257482017b8d00e0ecafc47097d68bf47d3",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+   "33451710956896b1a2d7111680b6c408b4bfba12",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "d17712e1d17c1b41aeb9d873519e19bce0625432",
+  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
+   "c444cb95402a7a5a85386943cf255fc4d5e0c3df",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+   "8d06c867b75f9f578314c5589a0e5726dfb2fe9f",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "e514cb738d34b5c4dc79b50c65ea565f65f47bf2",
+  "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "96ac4f9de15e784b4d8143c753a3f81d49c361c4",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
+   "ec0a21e2db1347f1193675ee6b441351f7b35663",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "679128d15f36f122b735acc80c92e22d3d0baa62",
+  "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
+   "6255a8d29cfb3c1c9a73b1e3afe03bd9e62a969d",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
+   "b878f3839f2423e6e9461eef3ecfff98c4364dc3",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "8afd60eabca0155acea7da94424a8164627599c1",
+  "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "01179a3fab96518fdddda0d4b42f336658874950",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+   "5072cbcf152f74bc9fee63a69c514d1d984987c3",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "f63430fde9102bbf11cbbef92033281a3fd6c147",
+  "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
+   "6941a3a73a35a8380b5d738588f84a7172ac51bd",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+   "cf296add12bf0872948c65bd8042cd1e74869100",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "6f78f7ab5819fc1a208719d8861868b1725e41d2",
+  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
+   "630393ca7b7c8d068bc663f5d02a320feb5e1f2b",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
+   "660496841a4b67db9d6ebab4879128461e3d0b82",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "10fca8ad729e90f341442f9614f1cab0f4dfbab9",
+  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html": [
+   "3f0455561a7cc68805855a198a064c113d7e34cd",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
+   "58a3e67dfb7d773ce133f037a987cc1194bc80b8",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "f60d3ed06cc7a0676929af913b05eb4c0b2af50b",
+  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
+   "fe7d67eac06ea36525e7b2d7d28a3253964a1ae2",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
+   "94d9aa008c80313c6e71a26715f3c932c931360e",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "44b1b21a711425a8f4e41ce71f61f73bce7b55a7",
+  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
+   "5b7d1de44cc3a09201e37e345f71499302d6179d",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html": [
+   "8b6ac65947caa0fe6b143aa42884d523f28dacff",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "8d9b118d13f191029583b60fe6802cd75839ebb1",
+  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html": [
+   "2f6692c42930b568c7862dd5535c0832d0bb2e0a",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html": [
+   "93e56189dfb6af99d27a33ee75ddf8bdcdfd3a80",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "e9349686169f71c8ef58772f6b1737b984906380",
+  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
+   "baf2fe784407fb8e1f32fefc8735b0a90ae77367",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
+   "0736088aa841d21dc4a27dae62260332ed9b208c",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "894676e8544403970deeea77b1166630ed39c299",
+  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html": [
+   "e6de3ee6078627f082db8f720bd4ba880215d5ae",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
+   "eb27059a957ff35608a8adda4a3c44bf4c6e877b",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "42b84b215082796fc31d3c74c9720ed4f4f5dd5a",
+  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
+   "eb1c0191a3bee7f8397e35181eda73fece70459b",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
+   "9d006903a0ecb7eb4f64fb4444e84241e5a60525",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "9383af1ee7125da47f43386a4687a0185de4db0f",
+  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
+   "911649a5d14a91e50d73446f93ecd407fca79642",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html": [
+   "27cb0340e0f7a640871797ad23916bd752c48050",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "03c22def281bc77e76be4dfdd426319f90a518b4",
+  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html": [
+   "08c297eae3be1e54e4a4801bdbfb12d5e7475a22",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html": [
+   "3b72cc842c99c49b59fe0c0abafea1a90205120c",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "f14ea6703b3a262de9edd0af6e0a5331b985a5d5",
+  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
+   "89532a53691ecf311dc1d91e4ec95b02f92d9932",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html": [
+   "959d00137c02d62fe2b295b9b3a24ddabcf94c6b",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "de791441ea7112958d98f2a7d1220ab9bc219cae",
+  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html": [
+   "7ba2e047912035f0455dda6e854cbf40befb131f",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "8b215bc8f4ccea682e8f4e426c5561287ee3dd67",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "83707cdee070a4b9715538062e3a76ea3f53dac0",
+  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
+   "4c4ea0c52d51fd6475a72bf8738511f33ba84883",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
+   "3ae29a17caa29bc0f0721070b752ceb9948df04c",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "2b92b33df18021e647ec87fd728551097e4320fd",
+  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "e47bca42c765f858671353650023afdf9ce763fc",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html": [
+   "c6421476aef9df2ee76315bcf69306a3f3e3e65f",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "142267bd452512c72bc26ac8fe3200ea53e1a3c4",
+  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html": [
+   "77c266d21e2f8c408b265f0ca819f0bb4ca2e11a",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "511058ccf50700159c9f8c9dee4c2f5e422aab1d",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "738f5c34adee16cc22129897ebf2486653a96dd6",
+  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html": [
+   "ffc0a2ee559cb7d488c14608a436be1a9f7447ff",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
+   "8ede638ebbf1cacb90e222cdd97da87aed440888",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "a3be0469c9f0446baa2e86671b6336c0bbf77c3d",
+  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html": [
+   "288fa038a4f41cd64567fb356a3cb88aa52f3f35",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "f8e8509b8c8494df8be4797eedf2277f624c39ae",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "29ac25d14a1251e6120e5983da6fbd54a8e95ebd",
+  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
+   "88ab886b2338d25ee790434fc25d8be68e13cbf8",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html": [
+   "f2482c3b3aebd55a69780f16a29899df697ec6ff",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "3a95f9f42b879e76901f0cace304ec5a66e9c088",
+  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "24ab142cfd7c61ad1dde43544e04c3ba83d1b614",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
+   "91d8a23ea5ea8eac7ddbd8e7e17055b761ad6a3d",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "177abec135b2f59ad53257466d465167a67fd5a9",
+  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html": [
+   "d486a7b8569bf5597aea470d5ec0a88507ad5f4f",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "bac54212f090b41c7e5c042137d5483eead4eace",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "8dace8330263e75529ad1f94b4752c024a9c1488",
+  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
+   "fe1ec67414d5148d1fdc4578132624ec4e79be3a",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
+  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.headers": [
+   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
    "support"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "5ba49e0acdd46d27221ea7a25a9b11fbf28e8032",
+  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
+   "d36ac614868ed5876dfd83d7d7f1baded7be7593",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
+  "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.headers": [
+   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
    "support"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "4bff34e02c947b0b9eeb6069556afac3bcce98c5",
+  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
+   "f4db0be0e50a3e66d7eadb2b1eaeff2fa1072509",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
+  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.headers": [
+   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
    "support"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "fa58ac157f2a69445a9d99ad22faf45e22a782c8",
+  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html": [
+   "e9125ad06822298506b35dda16d51f1273c3d03f",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
+  "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html.headers": [
+   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
    "support"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "4cf2262dab7ef7873a78e86d211335e5f06862aa",
+  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
+   "7d128a216ef75637832ff7a396834471efc5c417",
+   "testharness"
+  ],
+  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
+   "f93f8399ef7a63d1bf2bccac4c1c425381ffb94f",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
+   "ef7dfd49fe4b8a0ed379cc1b8818d482c8d81b1a",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "aedf67b946b677d8e7b5fb970ee0fd0a13bbe8bd",
+  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
+   "6335b58a250d6dd753fdff0d1d726914a2053deb",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
+   "bfae1b4ce35cd823606a7f5fc14fc0112a53b8b7",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "4181c8a875f9551ae91075adb547f6aa710d9869",
+  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
+   "3d8e32017d195ab4252b2507943a4fa8cc006b09",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
+   "9fa4ca3c127760d4889756e89839e65ae0a66d34",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "dc6f090b51b946b6a6aca2bfd25b8772391adcef",
+  "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
+   "feec6a71fff2d37100ce6a907cd9ad38cfa5cb12",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
+   "c9d64acd3ff519673914c0a921d1d4c6730d4ab4",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "22d449d42f4fbbc324612cbdc948475acfd1f0a9",
+  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
+   "2986e09860fd2ee0b6847efbf483c4ebc2a3b2fb",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
+   "b44acdd3f3bd62b513b1d41267e2810476ec65db",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "1492be672bfb13df313e3d87cb50712cb62bf63d",
+  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "da358ee0e1c90cda547d6e25bf2c4858db18ef29",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html": [
+   "a709e40c51bed38738d5fe4546688fd20095464d",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html": [
-   "c35639823ec90d0c9b0b00e96ca86592214b0999",
+  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
+   "140fbb9684b9834702b642c8ccc0f050e68372e6",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html": [
+   "be879a223147a9f9824f63665aea3b7614be1516",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html": [
-   "bc5f3bc3e9429d6c07b3bb15585c97184772874d",
+  "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "95973ce73085d514495c4faa60c8612de7e15db7",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "ef0836b8e8759325d50c23bcc206b5fe974e2593",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "c458763f10e926c7640b78235c35654fbe382097",
+  "referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "86f6a004c32706f57518b11600e41212876de0c6",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
+   "c404fcf03f9e76a1408f2387b338d9c6335333a7",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "00e1d936324fe7fd05988d17df302d8c1825e895",
+  "referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "f3f701fd230d672c61772c7054201569a1f59173",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
+   "2ea65da273ee14f51844c0ff2cd82d814e0d9901",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "c17379cfad0992c0498ad1653fd6ddea1f17ba2d",
+  "referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
+   "90a500cfae7b89c2a8541b58e8ce0804d0ab4718",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
+   "79c96e6f2b418a2bd7b07009a0b7d9270b2d8198",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html": [
-   "faca9b10f8728ddb4add24628b39a1f469539274",
+  "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
+   "714a08bc7bd4da9ff1812fd31768613d99df042d",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
+   "ff7e409b8d98db62ff9f3c442509d66f0e7919ac",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html": [
-   "b0c9e254228d35a30909b1a51df165e6f14e7cd7",
+  "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
+   "6e914683ee821997b67dee5cc1c0daf52986af15",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "1a8ab2b48306295d1b8f3eb87d8dfbc50f0b7358",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html": [
-   "ec8d76fc0c92adb52c2a19a6683e7a1fc8ff8286",
+  "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "4f8dadde3c41e15e568b9a6321e57b9cdfbdfe76",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
+   "8f130d28a17578f82edb8543e17aa4b045289b8d",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html": [
-   "3334b1aba363f4640686fc2baa665a32897c432f",
+  "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "75eadba3d1efa74cdc8c978f997963481e2b59f9",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+   "4fe3af9ffd3bb4b077f3c65e7f1f8817cce4685d",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "cf19b751ec82501464de5d1736a868584dafdf73",
+  "referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
+   "48631e39d2622d7d3e3133314c761790bdc00957",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+   "3b10e291d3361090bb84e60264154aeccbd17e1d",
+   "testharness"
+  ],
+  "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
+   "bbc4061c2d27c37dc54d6be19a831c6aa86f460e",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "4c44cbce0d9503a62143997a9b82f521e6073aea",
+  "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
+   "2d2ef35f6812f46c99af481956c3292dc69f12b4",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
+   "47c51d9df663b03012695da3516a02e6ab0695c5",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "61889e61f9568b2212baaf2a51de85c1dcef74dc",
+  "referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "330d3f0f907d853eb503531137c7deecf4a05b6f",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "ea15eec31891a4328f5cebf1d47df7d42f151a38",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "1a03c3d9dde8b3ce49bc03e41116eff54cba3179",
+  "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
+   "61323de7a029a42918dffd54dd6590fcdf4d2d8f",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "c59ee9d340c69148e2bdb886d4d52abae1f8f99a",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "35f3e69127d36b94afb1c3c7d2fd2fa5434a3fbf",
+  "referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
+   "51b9ba265647a4b6dabe21e112721d0dce0ce7e6",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
+   "72e74ac6802a9cf6de29353dcde4dea78c65ddee",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "9cc15eb4b9094c415b4a975b995d2b342fb8191a",
+  "referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
+   "39c651732647ee15c47c8f32c7258442bae8370d",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
+   "9af146296a2a51b9c76b3267c93a89c22f4bc3b1",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "dc5ffbd5de6f8736a2b33b6dea0a8ace8a95ecad",
+  "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
+   "4000dd3467dbccd3d31826653b47ad01ff54e37a",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
+   "547c19ff4852446c7766e2e7229939ad02ba0284",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "2ac2803d0ed16688731e75846de880a19e17c381",
+  "referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "ec64d6fff5a3033dbad357fc7b16a377907a0311",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "2623fe82db01c67d5339d87afb0340e9e5b8af89",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "5b22bbc5dce1625f0193d885cd883d49008253e6",
+  "referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
+   "adce8bdb5693cf9164c801b358c971adf44ae33e",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "fbfb700eb942f4f81b60865acc65a95b76d24a15",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "125d2fb6c3d973700747ac561e9976d130b75776",
+  "referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+   "68a33b74a18b0d22299f590b925c9485c883b453",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
+   "40e7caed48554bee235dd35989bd1f606dbf33d0",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "bf9143c2874d43dc97ac480ad1a84d8f1df7177e",
+  "referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+   "7992aa6e009b7eae992387bebbdfe9fd04cdbf76",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
+   "9c4011d2817e6fa18ad45b98b4cf60dbe862b48c",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "bdb66972d4a40bf141c8c144318c427c0f0e384a",
+  "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
+   "b174ef4feca3b4ba3edecdef4b5977f9f81e4783",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
+   "6d987fbcb5253f051dc4d3e2999a442fcfcfc56a",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "8aaeb88417742966b5a6083f9049f1efd2d5631b",
+  "referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "9fa486e6ef1b9cad07b3c8574951a506b77c39a2",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
+  "referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
+   "306a53536ac57625957da5cf4ff55e4124276617",
    "support"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "ff3cd97f49769e920a7798aa73b42aaa3b6ff12b",
+  "referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "40606039bedef1fe8d51e73c3591c805d9542caa",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
+  "referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
+   "306a53536ac57625957da5cf4ff55e4124276617",
    "support"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "3f38a8a242db2d113c62da3c0777fda1eef0ed5a",
+  "referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "669b174a081ddf8a9a343731ed95a3a0304af16e",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
+  "referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
+   "306a53536ac57625957da5cf4ff55e4124276617",
    "support"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "b1d13cdf89decd7791f7b26e009b739949384067",
+  "referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "ed249742bfda996c31ee78498720021f586daf60",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
+  "referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
+   "306a53536ac57625957da5cf4ff55e4124276617",
    "support"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "6e02ec75c7de9e4738de83846b59d2d5739f3542",
+  "referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "8a7ede0d2ddabaab705f9bc147e884fff273e98b",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
+   "1a5ad9592d5fd28fdbfd06bd2067e58b9c6b4fa7",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "dbba2048bacb0cb0078d9a5bfc2bc3b6db08c3f2",
+  "referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
+   "0ada60ada7117218c2211447c60a525bf33f0ca7",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
+   "1737905526006bffb455575ebfe0e8bec7167529",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "f945a1d0c8351cd04ebf5740c9df3f6f56b150ee",
+  "referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "60094d7f0abe1838bf39a4f720b77f0f94888a21",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
+  "referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+   "483a43cddb138648c2df46f4eb5ab6586c4b8333",
+   "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "1ed2a0198cad438b552305cd54f77223249a2002",
+  "referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
+   "f27831c876c8aa33b2d56b6b39e5d7ab12c2fe43",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "ba120250e9416c4bf6eac7a63065fd3c90c6a42b",
+  "referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+   "44042cd5008283236daf1483253fd8576c3c17f3",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "4652268659864706fc4e4b18436b1dfd4fd8e22e",
+  "referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "7599f2ff24317f5f4f29cdf28684db78a1cc1553",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "0c7c8484a4e916db57274e66ee21cdb1aa8791d9",
+  "referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
+   "f2a25196f712cc72458b8df5a22878fe6aab7e88",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "d6b47ccbd360ff099a755bbff274957556ee0c79",
+  "referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
+   "79c61faa4175c79013ec81332d4916f69b9438a0",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "96e137e4112fe17cba492d553a8897045ea8a142",
+  "referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
+   "3c2117ec0223436fd7fb76000f83ffca1999159c",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "06ba58084f3f45c209e4c48ad30050e7b0b0add1",
+  "referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "f3608e17eb9e9b4e00e97af35ecb5a2d27b8a68e",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "cc71a6ca6896b0ed81f30adb0d0c1408631915eb",
+  "referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+   "bde05c454fdc270c6c58b9b26d61c96dd12f08cb",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "18fa571fbf2d6b44cf6ff96096a5cc9bc6df8bf5",
+  "referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
+   "7d723ab86a122870119fc6e46fbe8d6d64a1992d",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "bbfd11f31feff89a66282043d560743696219b77",
+  "referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+   "e04b8253413a606b5913c532ac9c3934188310cf",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "d54694fb1eda6aba635677692b7de3bc72098d2a",
+  "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
+   "7bcc2189a06b278e172ef18e25f2eb77a9080976",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "6e1a080f9cb98653c77bf9c8b045b8d4f780d958",
+  "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
+   "052a9df8e718bc7f5b1a536b542afeb9e77d2d1f",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "6343373d16a75650431a4e082aa37f3238a2d955",
+  "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html": [
+   "92b1559f77a34faf3d2e27c3dbc9139bf6ac7594",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "5659e1f17fdb9d561e3aea3edb0677f8027e4e10",
+  "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
+   "c047ae9b3d2391726700ede6082f3290ede16268",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "bf32a5b6b59311f3ec32f977c614b446c45f3186",
+  "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
+   "a1e4d2d8adcdf6ce31d723674acb59768c59b6b1",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "59919b70ecd39a489523c49cf14e01c3bb14385b",
+  "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
+   "7a1fd76a93063b164e697d47a35d20c624d748bf",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "7b81605b86fcc1cd058c34446d2b92f0ff29d09d",
+  "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
+   "9b7cf05f66e8942ea379a7bd1af05708db5ac555",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "4a3370369644036e4ce16bd40ed182489f16f922",
+  "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html": [
+   "6c6bf43a24da351d73249c4938cf1022a3f058b6",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "d767da3fd7bf8ca76db18353170c9ba96424637b",
+  "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html": [
+   "adbecffb5055ad8b9601fb43131ff2ca18c3c41f",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "a119bd26f512f6c7ec14b669bce130667095eeb7",
+  "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html": [
+   "a0942713fda3f86974fed9cfb2e0ae32f985b0eb",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "9045c6f9877be62623a83f6e880c5ca9f3dee620",
+  "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
+   "b37889b65b81ba6c2f236eab1f7a52764111298f",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "79164f38d4f3bc6ff4cdfa38aad7825b7b8d8c0c",
+  "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
+   "dad6e7ec9af0b8026a449559e4eb102f030d7afb",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "dabf50d51c685fe96a1f0187e667173af77d7922",
+  "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html": [
+   "0e379e4312314b6ac9033b6077f3d8bbc92a6c04",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "6a28a4c5e54771ec5a16a0034f6b2d26eed28592",
+  "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
+   "1f7a8985a9eaf9c63aefbc1a94eb77692dc33af7",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "5c47aac9269384079e3d6b2f922e9ce25582aa1e",
+  "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
+   "2cbb6fd3489a6fb1610d396d1cd84b6cd39b5e3c",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "c5367f0e3cb11180719119d78b45a590e35ba3be",
+  "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
+   "289aa3faacd62c4a5b7664224f239a77ea217852",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "6df7de3ecdb23e89c8d9eca0a08a244e79117e15",
+  "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
+   "eaa417eca087df663bd992d9fa5681f3c725ecb1",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "88c6a0f7abacbccda0110f1afb4ca3835d3c772a",
+  "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html": [
+   "2d2c6d6d04bb77176f33a658f02d83931181bc1f",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "df434df7ab15e91e3b03dc958492a5d2626cc9a2",
+  "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html": [
+   "7e99eba7a8c0de14a5319861eb19e4bf051e5ff0",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "2a264a4b107019254fd384995eec852d44ca80ad",
+  "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html": [
+   "a294cba7c53bd8b21f22bcf72265ca21735e652e",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "a6775759e6aad03ef1a605d4ac941218a0fb5069",
+  "referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
+   "0f0f3f586c7061c81392fdbfbb0614a9a564c7d9",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "91e3cd520549ad076c744a33e3e5a83536cc0e13",
+  "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html": [
+   "29598521aae474ad8e0249e77f8c5ef35e122954",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "cc66c5cacd183b3be962f7c0b0ee09c57e80f01f",
+  "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html": [
+   "03618c360eb2ea6a16bdd000f81352ac06f4f8df",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "cbf5e1c28ff594acf69c7455d85af5c4cf4634ea",
+  "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "1e785d961ab5f83fa3cdaf6bb1d8096599e4c848",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "f2035473523352fae942d4465570d3b89700750c",
+  "referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
+   "4e046873b80698f0686963ffd19a4a5df3063677",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "f1837a8f7bb87e69eb636414d8914ef0c5f6cb03",
+  "referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
+   "c61e82351abae662c02d9f815581ef965395de0b",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "3882bfd35d98678e6e2de5a71e1962113bdf2a3e",
+  "referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "96fc319aeeb771d19f522f2056cc07424fa0de56",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "698f9f64c05ee59ae9970ad367b8d8164b2e1074",
+  "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html": [
+   "1e54e3910e47c0519b5d9300187ca6bfeebe42e2",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "5e6177d17285b7347edbb428ff0734d809895ba4",
+  "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html": [
+   "a67da15008442cdfdddc04b50b85fa45eda5ee2d",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "07314409e95ce6c648bb02dff11bca5cc7d9a40a",
+  "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "b5c0081ef670b30fab9000c250f5747155867d4a",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "c6aafb2d30694b446d4c7f9c540f43218a13616a",
+  "referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "9aeeff94ea29d6e9e3f4831f2e5ed2dd5b31cb05",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "3e27d0de2aaceb936883489d2d79513c78ea227b",
+  "referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "0b75d68887554411a66fd7a729fac2a6fbc34b20",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html": [
-   "621ac5bb3e5d2f0245411555ea15ae3bb17e214b",
+  "referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "2be11cbd75b1c632d25aef91215d435d53a775a6",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html": [
-   "8711a507ab5f9ea33e82bdd2a43b83d44cba5ea4",
+  "referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
+   "5923bd66f218c216f82ec0c8686e4063d6dee687",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "81294f80501b5104fd2d4547ac44b6410d862f21",
+  "referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.headers": [
+   "309da8091a927735fec71fbd4af9acb39eb3a964",
+   "support"
+  ],
+  "referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
+   "0bb7ff22833d0673710f999f25f1900524bdb938",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "d0b1553b75a754500052829bd4f02d194366ac35",
+  "referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.headers": [
+   "309da8091a927735fec71fbd4af9acb39eb3a964",
+   "support"
+  ],
+  "referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
+   "86ad248198ca36421a965986090a3eb47f15a1fd",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "1d5ef96999956ef350e4b1f249585e4d8c5a06c4",
+  "referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.headers": [
+   "309da8091a927735fec71fbd4af9acb39eb3a964",
+   "support"
+  ],
+  "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
+   "ed415758d0660d20a35d45453241c50539c3f95a",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html": [
-   "2e732e6567cd82f143302c061b2bb3126b98c946",
+  "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
+   "b3424b1ea90df159ac4357acdf1912aa7836db10",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html": [
-   "2529091d31c47d545e1c2e2901483a686d6bc5b9",
+  "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
+   "40c2b7a9ff80538e4597efcfe68206419d4550cf",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html": [
-   "ab2c0a35831c6e15ba4abf853dc7898cfa08e656",
+  "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
+   "13b9d94f53e651983f0c98f1368712ac686f8b94",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html": [
-   "56668b94ca1ebeb3bc681599cae4fa8525f3b6dc",
+  "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
+   "b50c0b60db869878263019cd538f40b5c91be652",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "f2593530884459a2e371f0bc04b16b8ebb741ad5",
+  "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
+   "2ae690c53d97c27f587fd4c7a2fc3fe959865e97",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "b5c7283668c11388c6aa57db48cd885af8deb773",
+  "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
+   "b14908a7b2cb7fc4271cbe54566f074053e84ea0",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "d4af8f3c3bbb4edff0acf210db39ffeab8e6fdf8",
+  "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
+   "485c8784c699bc4b8c93cb38a818965b1ff0e1e4",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "82055a7d4a265bdaaf5fd5f3b17da7710cbfee87",
+  "referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
+   "6f2de0eeff1a23b74ddc877eb405ffc125b62220",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "f501512aaf3581988b53732c1e8f126f11b5cd19",
+  "referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
+   "f6a28d48c1c87bada3f91f60d64d46b5874ef751",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "d76e3c62c5640d718abb63fcb5352eebb7dcf681",
+  "referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
+   "a38fcd1affaa899d1df49f5fef443ac3679a04af",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "7f50fdbe0775eed27bdf12fa6b8894c75de47700",
+  "referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "9ac2ca34857a77a6729ccb2aae308e72c339deae",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "529b4b306589c557ea728d67f01a970ce5107669",
+  "referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
+   "f0d6cdbf00c720d54d10495703455a1efccb3e1f",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "340e5d55d5c9e819fd8f9b5684effb5b3547e504",
+  "referrer-policy/spec.src.json": [
+   "ab02dcc1b16e0621ef241b375654a3cd41345e31",
+   "support"
+  ],
+  "referrer-policy/spec_json.js": [
+   "1b507dbcf14ed32abdf0953f0e0abdaecd73efe9",
+   "support"
+  ],
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html": [
+   "849efbc4e7f285e38b9d8f6e747f87cd1638121e",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "709d209649bc94b217e61e4dc3e5992b7243cb69",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html": [
+   "d3ee7cb684b1e59ff32a101ad3034c2f9ecd53b7",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "a94a77be5677dcec6895b81e2227cd747208b159",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html": [
+   "0f8d60ca672f2a9b335486120b6d81a3088efb6a",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "289d7ee4ee55e8def5deeff5bfd9858a8db504e4",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html": [
+   "f09d000eb723a6166ee5bf85a3e93f771813b042",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "e8314118acbebbf37b1f1727d571b4785471db60",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html": [
+   "e28acbe94298d32f9d34ff3307993c563ffe25a7",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "3b744a333ca9f76333e6a5914fbe95b0061a0414",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html": [
+   "948bb08791912b5ab811ca34da60a997c4e45cb0",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "00c704c6e381bd1d2d00e1ea11671e8994d4377a",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html": [
+   "ebf8d26f51746bfcc3582006b012d96a9216fab1",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "e35b0a640e3249b2c337f566e60eed2616bfbb46",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html": [
+   "990f752a23d090d7393b2a676c23ff7710496efb",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "19f9faed6191d5e12b372df7dad1afcb98816e26",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html": [
+   "66f41a0e32574feadfd911114f7d48e12b5a846a",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "42b8a17f07936eaa72485271cd909ec6abb214a8",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html": [
+   "8e23ad41dedb44702abceba00b31d5a720b19767",
    "testharness"
   ],
-  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "50ab0a6eaeb05a96b93a4ec41bad314571231f09",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "3baa66d36b82f19c60c3f85b5f6e2347d43418a4",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "14a6eeb2bc663cc5e6ca066dab853a1993784919",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "e5c060c86b3b673d7c9e5360bff394013c7a0267",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "92c65585c5921cc32010bd7de5a0db5b4b72d4fc",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
+   "8b036117d70250ae2f624999afecf0c00fedbb23",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "ede753c5361dbea97064e2b9fd20b2baf4edc7b0",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "e165003f6eabbdc0de301971e3f04743e5eb876f",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "b1f6e1dc1dda20c229fd99e22911cc228f2698c2",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "42492e23b77ec9eb33c5114594f5043f7773ae48",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "b69090ff2b99613114b71423f04d8187d6347399",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "984b0790d4254ea9c18fdb5eed37bd5b436d05a3",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "a5bda07fa1740f66cd26160858ecfb45e698a581",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "9bcf3910c1ecd04a9df83d300398dd42ab4a632a",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "c61e9dfe6f14e01d4e69adec9f55f4724786ebe9",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "cd8c557f05dca5eae753516200ab2c18ec2fba61",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "d7a06eae0dd9ac6757c838d6f6c98a686f0f0f72",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
+   "c38f30635362dd3301e5b37b38b5534c10c125e4",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "bd9d445ddc72cb7145c601e2d5dee5881592a560",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "b38e3d4668b89e961ff4b4d6faef3fe568de4c3b",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "4bcfe741384c86db11e80ab3081033c18e5cff22",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html": [
+   "a90739dc4990357d878770724092e77241d485f1",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "2f55f3f4bf31fdd628479d44084bb46f26304baa",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html": [
+   "83b3601256f6598d4ecd45da954406b7c8363757",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "fcdb3014ef792bd277ed0b15c17a8cf05fef7895",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html": [
+   "72dcd1d2738be6819a7633f3f46b05f6da2d91f9",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "f6fc0deec71d03747036bb4c23c4d6af84a05ec6",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html": [
+   "b56aa7a2c44f5a81ed4f0070c931e7141f620b35",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "90db32e38180823349e0f830481cd7557b275d12",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html": [
+   "bc6c1bfd1eac88b62d7692257087acf1bdc4ba05",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "2260553355211278f8943660ad00445509745a9f",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html": [
+   "6087f4b7db9ee86274233ed54c17d812932eedbc",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "83d37336587bca8a65b994d2ae0899374eda8fee",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html": [
+   "7d2599a1b7137d8dfd030cd49cf93781c1aa8180",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "269dd5ab8153cc69c6ee2535ec1722251832c217",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html": [
+   "6581ee64e4ab670f5eeab7cf70e294872f823985",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "5367d9e882e1ae5e0e5703dfe296b453f1380595",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html": [
+   "9403ed73bcdac48aef3a973274e980bcbf73f56e",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "999d68c277f371f59c5c55315e0517f2f2b3c73b",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html": [
+   "5345da2d6d45f40c793760d90aa5d1c4cda84b37",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "6e57d20ba552f37ab9635b73a3a7368b194e70f4",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "7230246dd234ddd552116923751f8838413cbf8a",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "b5e3d6c80a3fd065dc3e330149de035df8180f62",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "382334bba5cccf71d99e6abbbec51ed8e874270a",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "35dc6568c3ae5ede5a142ab984c3d901499b3019",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
+   "8481ed5ab38f218ab79abce299333551263eb6b6",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "cc38b182da7b83423d3715ec17eac8a5ebf2463f",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "db04cf7f5cc7620372daa6d0a9c86a6d1dcdcbff",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "dc3f4cf1e5ee3ac92cb63cf127eccc1f00a930bd",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "d35d0c25cc029fab16c1e15b958c9ce0a1ef9756",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "e5c1855fde432cdad8c9aaff2310c7e2574135ca",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "1a6e2a4aeb304f4ca897598060bdbb87bb270a95",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "4724f670f985c36d6d835da845b71c3b173dbda8",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "117a3dcd2e95c932ef2bf0084374b69472d626a2",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "74f9f0e8a748ee208706f004bfdc9ee9e58389db",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "bfd21f6f15f12bfe1123e2d44c699b9611097641",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "15a6abbf5ca8d2dabdc21f2fb6b81a5ba95cfa14",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
+   "2e6a113369b5bbcb6de531d36ba95f4fcfa66ba3",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "d8f487a90ef9c4b264a1ec2763ceee919b4bf300",
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "b9d2ab53f9a22f4b2add660ca90793c81ef47c86",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "14d4f5fb06baea3fea81da75b8801fdcdb9c2ea5",
+  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html": [
+   "4dd11a19be9285e60bc044dd955e808ea8871918",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "3e02f034fec45c922c1ec6db8559c32bf6f82664",
+  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html.headers": [
+   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
+   "support"
+  ],
+  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "22f1f3bdc72507d8c64e0af65d94e4f4df3813b7",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "3f20abbb40e9a4ed4c5d5d4ff651b79af58eed00",
+  "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
+   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
+   "support"
+  ],
+  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html": [
+   "26ba53745768bde86374b247c4543ee89ae0bc59",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "e594604429ff8e2c6ca4ce303a7e54190e94e413",
+  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html.headers": [
+   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
+   "support"
+  ],
+  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "2fe55648eebf16c4d566eb6514f5380a060119bd",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "3e0dcd40d3d229e1d6342a766d679510ff60348c",
+  "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
+   "d74467b0af6f7dda8bee9107a37e9c14661a9054",
+   "support"
+  ],
+  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html": [
+   "e2c794e2e2703178b33309c15df52fc5a92933fa",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "ef5a7e6c88b1f9e67912005b6c2e0c40eac87611",
+  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html": [
+   "6f0993c801077a16480913be20c0375af1eb9eb8",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "a50da9cb0cc45d547e7ff8d38e0e0a3c3ccd5f11",
+  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html": [
+   "9e03d5384e9b34246df8ee78306ff83c71cdc38e",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "4a01a41549b2fc56b75ec9ed283225002b1c71a9",
+  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html": [
+   "1a928cfec18993f7e92e5d9d500fa595e9ca4248",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "0a66eea4641c6d551aa1dae3103bca4985144e3e",
+  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "12a1bc66e0f32ca381103438654b2bece3152b14",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "5984794f2a08711464d4f36f6709e27420f2ed29",
+  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "3e11ade1bcf49632358cb1369706410b127b0326",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "0c02a2ead89a211af5b681f59e23af7665e532df",
+  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "27c4c842c947d851d30f484899de7817cc3b9b30",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "f22c4142335834d6dd4cf8f59d7604491a8615cd",
+  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "f28e884825ec8151381ea7096a08ee0b9970d1c0",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "c656d41de40ada58d1d745686f409abfba75409a",
+  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html": [
+   "62b85068c20f75deb45c338bbb0fecfdef214f38",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "874e3cb3bed3b6e14a5bd1488ac538508b2b34c8",
+  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html": [
+   "9acebe2f0b09702c5f00103067bc748e9f4b5744",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "9d54a27187284372bb7e8e5b433fb904b073a47c",
+  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html": [
+   "d1f8677bc8b25eaf2f27b83d91ccad1bd1bb9b41",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "43015a873cfb738b1f01607a2c5a393630f2fd6a",
+  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html": [
+   "a205d415fa384d246f497656e6bce1cfa161368e",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "ed58d7bd11b59dfc966b6f2549e140dee9cf8d12",
+  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "d8ba3dd25db345606c23cada85894fb6a4438456",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "c5114ecd89c8913e74373dd675213f0e80cf2b18",
+  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "4b94af4929c8b30586ba2b477233e7e493103b4b",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "34f650da7f40c04006e1447bc10ce48c5cc4d31d",
+  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "95d6345f7c4034ce5f7d8c0c3302f921a72357bb",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "1e668ae6d8b794e75c4e8a456a4d73997a5fa7d4",
+  "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "17f127f60366df1597b5187241a7e7437172152e",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "19d80342987ac6a3cc378d6277bcd672302e7444",
+  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "2fb347ef35b8ecc2206f272db95156cdb9a0e771",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "705411d518c88efcb1519e3941e1e0e793de3bc5",
+  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "0c34da119fcb3634866a7fe153256c3c92fcfa3f",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "99c1bc56a43ac09cfabf5a3fbe63421f618725a7",
+  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
+   "f992e3939256b8eb977231539bed90323c4b3ccd",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "607b4c29e802ce96fe3061adffb4627b63dcd0f8",
+  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "e1e6c13ea358c7f8f0178a37a30505271bb2b446",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "1bc364522cd27a8ba3607a8596f1ac105522bb72",
+  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "fc07b47fd6408b74c6767dbfc385adf699844614",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "ca8adad124354fdbeabb9ace93a7b2f931721dcc",
+  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
+   "083891dc3c131fb56f8d5372ca206b597c6cae71",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "b04ed3354dd51f29d0d7349a987c1ec895983423",
+  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "07601e37eb0bc39eb87bc3c8901d27bf6792f61f",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "5f1e54d48dbef0d778a29e09c6ffa3572b958347",
+  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "811265f11cecd9ca5e83c8ac4c51bd1f29c14d1a",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "a06130ce4a4b2859de2aee5dec0e3a6144d207cc",
+  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
+   "254a29152f87e95359fffd4749b2c625d379c3d3",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "fbdaf4b05572a2d080d8d08172ee5787a021cb7a",
+  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "f78fb878fffa6e52bd41177b219b019cb03bd482",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "4fd95a894c469a3b0a0d6d4f66423b91638bc2d3",
+  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "9c5035945c9081f4527343ba6df6372050def682",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "1f65303cd1026515064cf3bc664c952a94633b04",
+  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "4b238c0449d93ae792be3d56fd2d3640b28ef8d2",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "4b70a9afd131fb706467ca5c05811b4046777dbc",
+  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
+   "a860c257fd7cf4566bc988827416c09dfde21392",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "f3c586e12e2817550478835a1bb0d009bebec9e6",
+  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "a798c85d6f54988404b28b9afb0017dac6e8bcc3",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "9bcb05db1fee6710a3edd93004e2d023e7631a76",
+  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "3955b78f7ac922c6e05c118dd0c1c99aa675c56f",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "7b48d72c92e204c76ca5467a094727931e92944b",
+  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "f755d35c825441c134ad8b567f9283c1037a970b",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "5b539644181e96178bef8a84196f2328f5fb686b",
+  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "240a3c7f186c06a8271ed65e4bb9a868cf24f92b",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "841b54b58439330a7bf41dff8312e0908a73697e",
+  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "8d18e84cb76041841df3ca418d8c63f023c38424",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "ae3939410a8a67fe0e32fa8a5644025a4cbc34f5",
+  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
+   "38edd1b85df4ba87ddac07869eac39e9123d9a99",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "4e7d7c9b9882a2bf98da9987aa19a1e4e54af3b8",
+  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "95f4a17a2a762a1dbdd65b5a6c85899923269d6c",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "f48a201bbb015ec6866dd2f378d8a4ba0c9d1fcf",
+  "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "f80ba3759587e78087833d49cc28922a3020b9f6",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "111fa37e95e55269594a257665ff1b9e0e48f125",
+  "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "ed1b8c033be379b88933ea8c070194a9d0464ade",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "d1cc1faef430e0f16b5d9321bbf11dbb3046a4e7",
+  "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
+   "050eb6a3904a4dbfcbaa5bff5c4b7a04c5cee3f7",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "155e9fb7bf2f9c867dfa38e43a09ae522a174ac1",
+  "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "143f3f7c87a289c9dc0c673dacbbc537b43f3a36",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "bcd5661d9c05c94f8fc52d846ceb7417130944bf",
+  "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "ffc8190298064e81a4c3bc0ef0c3627cc83375a8",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "a637f732ea0bade62b89cc2853da442e09a9dbe6",
+  "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
+   "5d8be2bd928046bc40f74a14484e1bbd2f608ae8",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "18e29ee1fc6b22858c699faf7ff7dbd7f5027647",
+  "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "7ceb389b35b5e21b63fedd186ca8583d5c7c66ff",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "14ce35bd1eb9271ff7531687b70d39a8b6e8319c",
+  "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "f3f5573b7582ec9cce17345415f2df932a829451",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "e9b5f75f9cc1432933517a368de96a20f2e733be",
+  "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
+   "55edfc9376002b493f8a271fc7a5d62c27748802",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "392c57835588afd9e228780edb05782f8814b5e8",
+  "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "902fa3341a1812c19d8091055333bee7993745a3",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "58977c3e7b471d6fe5596ff17cba06b632a4ddcb",
+  "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "bd278695088c2cfdd5d028903cfe94f216d8114b",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "59cc2bda48578822bae191cebdbf0a9b085b9d77",
+  "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "331f865afb25e0066d4fa4861126931693eb0404",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "67625838e8d1dc8721a06ce66d5db7ad464072eb",
+  "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
+   "b26af2a076cdfdab3c761264efdb65452f32b7c1",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "45d7f1e916999bd0d3ab5e7466ed687374f960c2",
+  "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "0d7bdf20697948d118f95f71f69bae85e02151f6",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html": [
-   "7d495b43c578c3e22f5c4debda976fc8c3a870bc",
+  "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "1360edbceff54f3bfa446af531db26a377ca007c",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "afd29bcd69b335b4522fe9b5a366cb621ba7c753",
+  "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "2f99fa632176959bf717ef2a4eb6e3851c99d264",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "e12c41d3b65ddb093d7a6d7e1ae17c9714eeb356",
+  "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "f69c1341e0992a2fc3f1306c5cc3c795395e550f",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "e44998937144817a9bbaea2fc7b0e41b51363fbb",
+  "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "e7ea376cd142a551f3178e35389c9f28e83224a4",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "7544a66b826163be0a8f355078d476141403bf34",
+  "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
+   "859c7267ad547066506e11518ddfac7ebcf16b1e",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html": [
-   "6c1bf13374562ced88c53e19265857bb0c3d1db6",
+  "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "747c8e1059db4aeadb3d99fa855619e522d8b225",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "e6424cdf9335297fba275058f3087cebefd2e23b",
+  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "9aa77a78c63ae46e9fc13923c66f3d77c1b8e7c3",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html": [
-   "284af1c6860bdbcbb2901f7cf06f2cf72ca509d4",
+  "referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers": [
+   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
+   "support"
+  ],
+  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "3877d5bce4f2c550ab74d46be30b7636231aeaec",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "8c7f2bd5d37afd713f54150537142d0074a2d2bb",
+  "referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
+   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
+   "support"
+  ],
+  "referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "3449a347dca51f652a994af3db05e877f705f2ac",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "5ba5152bc2b200b1beac67fc3a520ed32dd7bf25",
+  "referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers": [
+   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
+   "support"
+  ],
+  "referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "fb86bc5c45fa86aea0caa61611cc63dadabfea7d",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "fcf8844e9008d86427f8430bd0459d2a08f5977a",
+  "referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
+   "07af8e286fd7431890f78f10b9e8a0f4b106b5cc",
+   "support"
+  ],
+  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "597f4092c2f3160e82176f549fb8507c13b7eb17",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "698f15f58c1dcdfab9ad090bfd8bfdd79de6c429",
+  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "0fc489100e8d6d74055f7e91e7eca68ffc8318bf",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "26b14d7314914d3cb3739a37a52634b27aacbc4e",
+  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
+   "0028b48d0b7e97f404b3c532864d01671d709286",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "c632fa8e7834c972ec775bba86a8b1bf85e0358d",
+  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "8b2dea1cb62f4d5fd0dfdbe22617e9a9997a4046",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "4590df6a0158343be205f2d65eede19f8c84c4a7",
+  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "c43e52e9dfb1b4301b6d275836c44aa5af0dbb8e",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "cbe8df3c4101810d9e053a2abf9b9684fab20093",
+  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "41025c58578ab4aad59c0173077e560d0269f193",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "69e5b6b483c76f8d9be9a7529d06adfe3c2cc560",
+  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "ada714dcc5088fd580daf2b5cc12e5a71233d7a7",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "177bdd6c7722cf73b438584ee2421c6b9c547745",
+  "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "a574b1304117a6caeea002855820764dbbca9d45",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "abe6ef4500c3319081f87d5e31dce50d5082f7da",
+  "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "335ff468d905ee397358dc7caab8dff492ce164f",
+   "testharness"
+  ],
+  "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "3675e2391e4e72c154db32767af24039b396b70d",
+   "testharness"
+  ],
+  "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
+   "a94bdfa5d530d9916519262cb89aef7a1e82626a",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "15fb33654e5d473876dbbf7a96b309154acf386f",
+  "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "623f6a6e81aa33df2fb6d12a7df7bcb353c91c99",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "0d52c78f4a97f1371c52f1e226e7c35b909c2c06",
+  "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "0e40587a04020bb8526448e5649b5ff179b612c2",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "ef9db2cbca18dd70e3712419f4ed4ef1e8797eb8",
+  "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "7c597fbcec5ff35babb6219d5a22be50857cbee4",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "02678004f519f4d011144c2a855aa4ccc27469f6",
+  "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "7ba85fb790c517f3223183557921082709f6c38c",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "c391b257a816154a2d68ded1afced901668aa8a5",
+  "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "fe6b2b59b8b58304d4815fc6340b099e9177872c",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "03c4677086d5df06155054fb110be80462dd200c",
+  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "00587b4f18a6afa814740c3148d671600e243089",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "60a0f6ebcb33854d6e34731ad931faa772a22733",
+  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "3bcc6e82a70198f0c397cf2968feda346dda175d",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "d1745b41235b86cfe0d817f3080dd533765668b2",
+  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
+   "387a0b3e6d5d9412f4c00139675f6c6937a7d59b",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "989c847a5b903f6611db7a66418f7071a9cb8508",
+  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "e19734a542ae759c235549e55badf0fb64a8da11",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "33df9910306ef3a6d44f0c11fb7d514ac83d09de",
+  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
+   "72eef24fef5e9131501a0959a1088053fbc6e278",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "d11c4a1897bc444eff605e93975be7a620c4757b",
+  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
+   "c789cf6d302b2e1acdee5cad196950f7f603037d",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "2bf06bb2110bf5cdd8f6bc71f075922f5f824e2e",
+  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
+   "a24af8beb2dbb79316b79e07e9184c14e99c3328",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "2bcca81084ca5e00c11d5f9d062c66cbf81a2c83",
+  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
+   "a2773bfb160e4e998c5ea08e28c9824f151df2ad",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "e4b835d864414aa6618d34c3a150ac49df70e72d",
+  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
+   "72cedc5e35c5c1a6c0eed922de72b743276b5850",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "20590be9e244841b5f48d9cd8d8ee79b1eff53b0",
+  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
+   "612d7b36280cdec928734d007dd7d853a52cf5eb",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "cf7b83ef20a7d41c5fc8d5617d4519da8af9145d",
+  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "dca3d06299409aa44d3a8fe98b82875c7702754d",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "96f5f8c07a1d0b4172c9ee7e30d8254c4b108591",
+  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "2c5328ff25e68f4c362dee910453e7ec7323f010",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "8573cd5e8ee1547212c0afd5ca29eda46c27245f",
+  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
+   "54dab293d80e500094aebe896ffed492dfefa96e",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "8bf8bd05ff1f300d84760c52afc6d8643f6bf0d6",
+  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "9899e2f4e6b7ebb7b9b8d1afc7266ed50384150c",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "8d330b11bca89e7e15548886bf9012f944d2d26d",
+  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+   "98a55358c7e8056157192bd994daeb8c95917f9b",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "fe3e977d0000e350fb5a8dec95ceea7daa2afbab",
+  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
+   "d5843c83a955cb9a14621405ec77fd8620aba947",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "4db7894a80f04d6cf7ea9a7b942b32eba349cd88",
+  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+   "f7d63a639ef29924cbdbab9f6f173365f2f0ec7b",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "8bb522349b0b6c1645ee6c167345eb46d812db1b",
+  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
+   "bcf8f70bbf774bf7240314da1fdcd8d24c059782",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "db792b5164a2087cf1a5b5c14d02cdc99fb84bdd",
+  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
+   "eca04d52b0274beed7eed501809302e08c2ea166",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "c9b99a6b84184e1edfc8590311770c5d9466e921",
+  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
+   "91d7ac0ab4d93b9445de7382c8ea0a7958ace19d",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "8cdf6d70efabb8048225ab0fde804eabb0714d3a",
+  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "72eed78e5a241f9f6548f55812e8335fa723d784",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "9a41ab1b006a1c91000edde42d9f7c000d3c4c26",
+  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "7a45e12f4f8facecbf19ccc1b9735e04ba5f4ac8",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "581efdb75d7baf1d878045ea8a8876b3f4b8c0c6",
+  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
+   "5facb852896e54c8c399d47b72dc7a914e576ea5",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "f2c77dcd96c1e06f10ecba4ca24f5d3232e3368a",
+  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "8ed4f6340056660fd25a65396d69504d4c314601",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "8db2725b16bad4bd349abdaba4e2baadb867b818",
+  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
+   "70403fe53654d6a931f70fa05cf441e2cc574c8f",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "11baca87b2482422f0cf6b5a004645a7e9afae61",
+  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
+   "32dacf7ffdcd6994549e01d73bf5db33a51f72d2",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "0dcfaf498709fcbc66514794d237e8af41ece7cf",
+  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
+   "433f51b14312f8de24d1c81041330a9f3dfb894c",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "7f14e55c1314658193e256b21651129be80de31f",
+  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
+   "b23ffd4b8e2ca1ccb78229d9f96a20c47b288ce4",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "1c44e334cfd1b9a7f8da224e5aaf53175264f040",
+  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
+   "08f7d0928944cff07ec99f6133f2b2b8bfc058b9",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "e349d5686ffb375d92aca01df466119fc55a53fa",
+  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
+   "f5bec43c8b225ba84858532dce2336d7c09d6854",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "500d47a1c954e4560255b3a4047df271dae4ba2a",
+  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "c1d52ddb51465285fd9b8d4099f3add98930ad47",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "21549ca927e0d9b3693a85e4462aa4f3878385ba",
+  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
+   "5225f28f85073b1733fe5f895dbce696ca2fd4dc",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "ca7d40ed2f6480b86302ae6059787c789afc4a93",
+  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
+   "e17dbf9ef6a512a37a93a0795686da06b0111ecc",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "fdc8bbef59d399c298a8b2b686fa6b874390eea8",
+  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
+   "613eac440b5089f3375c9b1f542115d75ef34ba6",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "e6518c9e47974797527f917b53cd8237ba90a9b1",
+  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+   "dfc5328013a50d133a51e8036cecf782f7460840",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "31ef25738901928642d370e856fb99428b10b15c",
+  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
+   "ea9605e8169f523a8ceb8bcb107aec2a4147888a",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "220b5aa320dd3fb84c53fb2dc2b23d0504fe3cb6",
+  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+   "8b5e5cd9c0c39cf22d18ae05170c66e42afdfa43",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "f0b4658aec639d7a751685263ceed718d9113642",
+  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
+   "0913d31a24f697fb415b9f3613689313672cd9e5",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "4cfd819a47321b343bb0f5211cae6b99f900c996",
+  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
+   "2b06a9ab2a2c2137c8e5dff00176abb96c3f9923",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "4ea3fe52684ff1bf2bf515d26a89cda3b4ab45e0",
+  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
+   "d8375c93426751069de86076316f9d9eba38e89c",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "0978fb710d6d925d418ff739a4b65d65707137a2",
+  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "3353f70740458abee966085e45f14bc359db7e97",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "7a4fe02b9b7d32190d5cc449981802716e258b6d",
+  "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
+   "c67e521584390fb6c068bcb1a814d73ed9543570",
+   "support"
+  ],
+  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "8d9b118d13f191029583b60fe6802cd75839ebb1",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "bf7140a15d274fb1c7861a74e3089707dbcde37d",
+  "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
+   "c67e521584390fb6c068bcb1a814d73ed9543570",
+   "support"
+  ],
+  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "8dace8330263e75529ad1f94b4752c024a9c1488",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "a40088b5b677ca84b1d0791f768281f302d90522",
+  "referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
+   "c67e521584390fb6c068bcb1a814d73ed9543570",
+   "support"
+  ],
+  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "1a03c3d9dde8b3ce49bc03e41116eff54cba3179",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "763f6f02ee4e2f72c90a883afece94f53331806a",
+  "referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
+   "c67e521584390fb6c068bcb1a814d73ed9543570",
+   "support"
+  ],
+  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "1ed2a0198cad438b552305cd54f77223249a2002",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "21065a0f8b5b95b73494788a1d1a422432e17584",
+  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
+   "cc71a6ca6896b0ed81f30adb0d0c1408631915eb",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html": [
-   "21b9d284bfae0c8f67e742a931f2ed17847ed497",
+  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
+   "18fa571fbf2d6b44cf6ff96096a5cc9bc6df8bf5",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "6911528c08df17a1257a6f5d77036e51c20f0347",
+  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
+   "bbfd11f31feff89a66282043d560743696219b77",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "cf7d1dd9c279a27ec972cb3c465e4f168b39bdae",
+  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "7b81605b86fcc1cd058c34446d2b92f0ff29d09d",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "21882b16a44eccd2054e25bb79869e59f21d93d0",
+  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+   "6a28a4c5e54771ec5a16a0034f6b2d26eed28592",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "0028373a419d443f55eb87bd20bf77126dfc49bb",
+  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
+   "5c47aac9269384079e3d6b2f922e9ce25582aa1e",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html": [
-   "17eff8230843f649f38fcf2e13196997e5168a11",
+  "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+   "c5367f0e3cb11180719119d78b45a590e35ba3be",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "dfff2a541dc8cc5a369a85a440b86eb85bc01d3d",
+  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
+   "cc66c5cacd183b3be962f7c0b0ee09c57e80f01f",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html": [
-   "3c7cea5bca027ea0cf99d99894c7e289ac5ab270",
+  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
+   "07314409e95ce6c648bb02dff11bca5cc7d9a40a",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "96971a833e3ac8259f269baf09dd9c2bf9db4d0c",
+  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
+   "c6aafb2d30694b446d4c7f9c540f43218a13616a",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "c98fa10e571784818b4e98efa4d7f87a88d4254f",
+  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
+   "3e27d0de2aaceb936883489d2d79513c78ea227b",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "4fe678652d0547e27cd21a375e799c0b5237f0ca",
+  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
+   "82055a7d4a265bdaaf5fd5f3b17da7710cbfee87",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "0f7f92fa9073418db035af3d3dbbcfbd7ac0d3ba",
+  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
+   "a94a77be5677dcec6895b81e2227cd747208b159",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "c2e04ad3614d825f572acaf798400519d46369b3",
+  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
+   "289d7ee4ee55e8def5deeff5bfd9858a8db504e4",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "1aaa67c96d122b59dc70c098bbfad3d4e8178308",
+  "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
+   "e8314118acbebbf37b1f1727d571b4785471db60",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "7af45bc8865786282b668007be8834c91cfddcda",
+  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "f22c4142335834d6dd4cf8f59d7604491a8615cd",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "054b2eb241ab4c5801257e2e7a4dcb0907faee34",
+  "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "5f1e54d48dbef0d778a29e09c6ffa3572b958347",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "faf51f1e759fc7060412ba330c8be0d5574e446c",
+  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "155e9fb7bf2f9c867dfa38e43a09ae522a174ac1",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "a91416957959dd96a1a42291dbebc6f003c93c87",
+  "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "698f15f58c1dcdfab9ad090bfd8bfdd79de6c429",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "6242cbd961b784a3613f39946bf9f9c2ca45b147",
+  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "989c847a5b903f6611db7a66418f7071a9cb8508",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "90eb85f139809e22b05b29772ddf1f44f22c6fda",
+  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "cf7b83ef20a7d41c5fc8d5617d4519da8af9145d",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "74f43287d9b1a59a1c8f98b3b34bdb90f2e383d4",
+  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
+   "96f5f8c07a1d0b4172c9ee7e30d8254c4b108591",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "53cdc7edf00539770febe12e7abaf95a74e3b2ce",
+  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "8573cd5e8ee1547212c0afd5ca29eda46c27245f",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "406ef5dff60559e9be4f0e1aad56b63c321d83d7",
+  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "c9b99a6b84184e1edfc8590311770c5d9466e921",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "993c9ea86b19df0d8eddff027d154884197b87a9",
+  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "0dcfaf498709fcbc66514794d237e8af41ece7cf",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "d88b4994e32f0818db42e3ec40e0bde2c949b28f",
+  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "7f14e55c1314658193e256b21651129be80de31f",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "e5a4240f5a4d052763d392d0f69d64936ee2175f",
+  "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "1c44e334cfd1b9a7f8da224e5aaf53175264f040",
    "testharness"
   ],
-  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "834e2ef0101889b0c71934b2f0255bd7269c6a74",
+  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
+   "31ef25738901928642d370e856fb99428b10b15c",
+   "testharness"
+  ],
+  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
+   "bf7140a15d274fb1c7861a74e3089707dbcde37d",
+   "testharness"
+  ],
+  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
+   "a40088b5b677ca84b1d0791f768281f302d90522",
+   "testharness"
+  ],
+  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
+   "763f6f02ee4e2f72c90a883afece94f53331806a",
+   "testharness"
+  ],
+  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
+   "0f7f92fa9073418db035af3d3dbbcfbd7ac0d3ba",
+   "testharness"
+  ],
+  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
+   "6242cbd961b784a3613f39946bf9f9c2ca45b147",
+   "testharness"
+  ],
+  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
+   "90eb85f139809e22b05b29772ddf1f44f22c6fda",
+   "testharness"
+  ],
+  "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
+   "74f43287d9b1a59a1c8f98b3b34bdb90f2e383d4",
    "testharness"
   ],
   "remote-playback/META.yml": [
@@ -673766,7 +674542,7 @@
    "support"
   ],
   "resources/chromium/webxr-test.js": [
-   "b52ee3bf32523e39d9619db8ede5b9b75c8a1501",
+   "73dda0920f12fb0f674f41765b27bd1c3c4a6b6a",
    "support"
   ],
   "resources/chromium/webxr-test.js.headers": [
@@ -675702,7 +676478,7 @@
    "testharness"
   ],
   "service-workers/service-worker/activation.https.html": [
-   "5755758e5716dbc608e7e773bf9b83ab3f2f7e91",
+   "007ecaad76c95935dd57470c660575305dc6bae1",
    "testharness"
   ],
   "service-workers/service-worker/active.https.html": [
@@ -675822,7 +676598,7 @@
    "testharness"
   ],
   "service-workers/service-worker/detached-context.https.html": [
-   "5ae4de8cc81e0c3650eaaf6b5656193d4a2cf8b0",
+   "f96370d201000d20a950166dccf2caf72bd473c1",
    "testharness"
   ],
   "service-workers/service-worker/embed-and-object-are-not-intercepted.https.html": [
@@ -678950,7 +679726,7 @@
    "testharness"
   ],
   "sms/interceptor.https.html": [
-   "86b21922284f946a16bcd295a87851bee7569f9a",
+   "39b749b6d32c32a3254043067deb4dc695a0ad4d",
    "testharness"
   ],
   "sms/resources/iframe.html": [
@@ -678962,11 +679738,11 @@
    "testharness"
   ],
   "sms/sms_provider.js": [
-   "4506135551c771d056dc202f06a4c00a7c31089f",
+   "11fd8466e986bd9e723791ea6d06f507a17e1247",
    "support"
   ],
   "sms/sms_receiver.idl": [
-   "b71b6a3e0db2b74b127e4332cd83f218bb39d6aa",
+   "64048523f901f8509e85e4dc1ddc1f7c59ab3489",
    "support"
   ],
   "speech-api/META.yml": [
@@ -679853,6 +680629,10 @@
    "7a9ad43dd98e00f7e2af4957365441a29aedf8e6",
    "testharness"
   ],
+  "svg/animations/beginelement-instance-time-1.html": [
+   "aa1cb8c983d482439fccc6d91b50e69585f4d404",
+   "testharness"
+  ],
   "svg/animations/change-css-property-while-animating-fill-freeze.html": [
    "6774c3475a681f9fc91e8280ded739e9e65f4606",
    "testharness"
@@ -680341,6 +681121,14 @@
    "08c47454b6cb46887f6ab91c0e031d729538c572",
    "testharness"
   ],
+  "svg/extensibility/foreignObject/masked-ref.html": [
+   "1a3b13c94516521266cf77e55abc11c3e81df8f8",
+   "support"
+  ],
+  "svg/extensibility/foreignObject/masked.html": [
+   "ad18e8931aa9bbbac967b4d0ae694d68e92dbbb2",
+   "reftest"
+  ],
   "svg/extensibility/foreignObject/position-svg-root-in-foreign-object-ref.html": [
    "668eb9b8c7e469540219b5ea9010db28239ae432",
    "support"
@@ -683782,7 +684570,7 @@
    "reftest"
   ],
   "svg/struct/scripted/autofocus-attribute.svg": [
-   "6c095a4bef5045d7aa19e8197ad3950448b166bc",
+   "d8f25741ee40cc488d504065548342c095cbc4c3",
    "testharness"
   ],
   "svg/struct/scripted/blank.svg": [
@@ -689290,7 +690078,7 @@
    "support"
   ],
   "tools/wpt/tests/test_wpt.py": [
-   "04c0723aacb61e678b6481ecaf0d5de61789ad39",
+   "a2498333c2b51e7c985e28124d0c75a0fd5352c3",
    "support"
   ],
   "tools/wpt/tox.ini": [
@@ -690506,7 +691294,7 @@
    "testharness"
   ],
   "trusted-types/block-eval.tentative.html": [
-   "e1a6a69accd1fa8ddaddd1c49970755a275bd8eb",
+   "cd4f5827c5331318a86dc71a42bc9eb037eb5b95",
    "testharness"
   ],
   "trusted-types/block-string-assignment-to-DOMParser-parseFromString.tentative.html": [
@@ -690566,7 +691354,7 @@
    "testharness"
   ],
   "trusted-types/eval-with-permissive-csp.tentative.html": [
-   "68d119a520121f2c5a3f88028abcf657799b9123",
+   "25b4948c039c68c425e22f5e30ae4338327b6ce2",
    "testharness"
   ],
   "trusted-types/idlharness.window.js": [
@@ -690589,6 +691377,30 @@
    "4079f7e9c7933cf9ee195fe0e7a54e0f56f184ab",
    "support"
   ],
+  "trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.https.html": [
+   "f60bb9fe5140297b324e7e618c6c0230890feb30",
+   "testharness"
+  ],
+  "trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.https.html.headers": [
+   "4bc0bd3c1ab29d551a5e9988bde5a9dc8f6fa1a7",
+   "support"
+  ],
+  "trusted-types/trusted-types-eval-reporting-report-only.tentative.https.html": [
+   "1fb65459468d96f86e4a467aa8da2f3be489ae31",
+   "testharness"
+  ],
+  "trusted-types/trusted-types-eval-reporting-report-only.tentative.https.html.headers": [
+   "ba26c77fbf498385424205b8bff0c404f0f5357b",
+   "support"
+  ],
+  "trusted-types/trusted-types-eval-reporting.tentative.https.html": [
+   "309873cb1f8028ecb071ec5db3dfda62337e6b43",
+   "testharness"
+  ],
+  "trusted-types/trusted-types-eval-reporting.tentative.https.html.headers": [
+   "2e935f73a48c42346b6352fa6cd16d12294eebd8",
+   "support"
+  ],
   "trusted-types/trusted-types-report-only.tentative.https.html": [
    "f33183b4906975f03ebb3f3a21adb63839c89adb",
    "testharness"
@@ -701626,7 +702438,7 @@
    "testharness"
   ],
   "webxr/xrSession_viewer_availability.https.html": [
-   "686859166feb773c9f5701a801630359e7abdc4c",
+   "c509e5f1a2a992b9329fd55e591e37fcea2b6e91",
    "testharness"
   ],
   "webxr/xrSession_viewer_referenceSpace.https.html": [
diff --git a/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-animation.html.ini b/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-animation.html.ini
deleted file mode 100644
index 5496474410b..00000000000
--- a/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-animation.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[mix-blend-mode-animation.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flex-wrap-006.html.ini b/tests/wpt/metadata/css/css-flexbox/flex-wrap-006.html.ini
new file mode 100644
index 00000000000..2b2ae5489c3
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flex-wrap-006.html.ini
@@ -0,0 +1,2 @@
+[flex-wrap-006.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini b/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini
deleted file mode 100644
index e6e1f29e274..00000000000
--- a/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[matchMedia-display-none-iframe.html]
-  expected: ERROR
diff --git a/tests/wpt/metadata/dom/idlharness.window.js.ini b/tests/wpt/metadata/dom/idlharness.window.js.ini
index 2561d3bc43d..2b018c8e4bd 100644
--- a/tests/wpt/metadata/dom/idlharness.window.js.ini
+++ b/tests/wpt/metadata/dom/idlharness.window.js.ini
@@ -529,3 +529,303 @@
   [Element interface: element must inherit property "shadowRoot" with the proper type]
     expected: FAIL
 
+  [XPathResult interface: attribute singleNodeValue]
+    expected: FAIL
+
+  [XPathExpression interface: existence and properties of interface object]
+    expected: FAIL
+
+  [Document interface: operation createNSResolver(Node)]
+    expected: FAIL
+
+  [XPathResult interface: document.evaluate("//*", document.body) must inherit property "BOOLEAN_TYPE" with the proper type]
+    expected: FAIL
+
+  [XPathEvaluator interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [XPathResult interface: constant NUMBER_TYPE on interface object]
+    expected: FAIL
+
+  [XPathResult interface: constant ANY_TYPE on interface prototype object]
+    expected: FAIL
+
+  [XPathResult interface: constant STRING_TYPE on interface object]
+    expected: FAIL
+
+  [Document interface: xmlDoc must inherit property "createExpression(DOMString, XPathNSResolver)" with the proper type]
+    expected: FAIL
+
+  [Document interface: operation createExpression(DOMString, XPathNSResolver)]
+    expected: FAIL
+
+  [Document interface: new Document() must inherit property "evaluate(DOMString, Node, XPathNSResolver, unsigned short, XPathResult)" with the proper type]
+    expected: FAIL
+
+  [XPathEvaluator interface: operation createExpression(DOMString, XPathNSResolver)]
+    expected: FAIL
+
+  [XPathEvaluator interface: calling createExpression(DOMString, XPathNSResolver) on new XPathEvaluator() with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [XPathResult interface: document.evaluate("//*", document.body) must inherit property "UNORDERED_NODE_ITERATOR_TYPE" with the proper type]
+    expected: FAIL
+
+  [XPathResult interface: attribute resultType]
+    expected: FAIL
+
+  [XPathResult interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [XPathExpression interface: calling evaluate(Node, unsigned short, XPathResult) on document.createExpression("//*") with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Document interface: xmlDoc must inherit property "createNSResolver(Node)" with the proper type]
+    expected: FAIL
+
+  [XPathResult interface: document.evaluate("//*", document.body) must inherit property "ORDERED_NODE_ITERATOR_TYPE" with the proper type]
+    expected: FAIL
+
+  [XPathResult interface: constant UNORDERED_NODE_ITERATOR_TYPE on interface prototype object]
+    expected: FAIL
+
+  [XPathResult interface: document.evaluate("//*", document.body) must inherit property "ANY_UNORDERED_NODE_TYPE" with the proper type]
+    expected: FAIL
+
+  [XPathResult interface: constant UNORDERED_NODE_SNAPSHOT_TYPE on interface prototype object]
+    expected: FAIL
+
+  [Document interface: operation evaluate(DOMString, Node, XPathNSResolver, unsigned short, XPathResult)]
+    expected: FAIL
+
+  [XPathEvaluator interface: operation createNSResolver(Node)]
+    expected: FAIL
+
+  [Stringification of document.evaluate("//*", document.body)]
+    expected: FAIL
+
+  [XPathResult interface: constant BOOLEAN_TYPE on interface object]
+    expected: FAIL
+
+  [XPathResult interface: operation snapshotItem(unsigned long)]
+    expected: FAIL
+
+  [XPathResult interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [XPathResult interface: existence and properties of interface object]
+    expected: FAIL
+
+  [XPathEvaluator interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [XPathExpression interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [XPathEvaluator interface: existence and properties of interface object]
+    expected: FAIL
+
+  [XPathResult interface: calling snapshotItem(unsigned long) on document.evaluate("//*", document.body) with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [XPathResult interface: document.evaluate("//*", document.body) must inherit property "snapshotItem(unsigned long)" with the proper type]
+    expected: FAIL
+
+  [XPathEvaluator interface: new XPathEvaluator() must inherit property "createExpression(DOMString, XPathNSResolver)" with the proper type]
+    expected: FAIL
+
+  [Document interface: calling createNSResolver(Node) on new Document() with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [XPathResult interface: constant ORDERED_NODE_ITERATOR_TYPE on interface prototype object]
+    expected: FAIL
+
+  [XPathResult interface object name]
+    expected: FAIL
+
+  [XPathResult interface: document.evaluate("//*", document.body) must inherit property "snapshotLength" with the proper type]
+    expected: FAIL
+
+  [XPathResult interface: document.evaluate("//*", document.body) must inherit property "invalidIteratorState" with the proper type]
+    expected: FAIL
+
+  [XPathExpression interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [XPathResult interface: constant ANY_UNORDERED_NODE_TYPE on interface prototype object]
+    expected: FAIL
+
+  [Document interface: calling createExpression(DOMString, XPathNSResolver) on new Document() with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Document interface: new Document() must inherit property "createExpression(DOMString, XPathNSResolver)" with the proper type]
+    expected: FAIL
+
+  [XPathResult interface object length]
+    expected: FAIL
+
+  [XPathResult interface: constant FIRST_ORDERED_NODE_TYPE on interface prototype object]
+    expected: FAIL
+
+  [XPathResult interface: document.evaluate("//*", document.body) must inherit property "numberValue" with the proper type]
+    expected: FAIL
+
+  [Stringification of document.createExpression("//*")]
+    expected: FAIL
+
+  [Document interface: calling evaluate(DOMString, Node, XPathNSResolver, unsigned short, XPathResult) on new Document() with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [XPathExpression interface: document.createExpression("//*") must inherit property "evaluate(Node, unsigned short, XPathResult)" with the proper type]
+    expected: FAIL
+
+  [XPathResult interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [XPathResult must be primary interface of document.evaluate("//*", document.body)]
+    expected: FAIL
+
+  [XPathResult interface: document.evaluate("//*", document.body) must inherit property "ANY_TYPE" with the proper type]
+    expected: FAIL
+
+  [Document interface: new Document() must inherit property "createNSResolver(Node)" with the proper type]
+    expected: FAIL
+
+  [XPathResult interface: attribute stringValue]
+    expected: FAIL
+
+  [XPathResult interface: attribute booleanValue]
+    expected: FAIL
+
+  [XPathExpression interface: operation evaluate(Node, unsigned short, XPathResult)]
+    expected: FAIL
+
+  [XPathResult interface: document.evaluate("//*", document.body) must inherit property "UNORDERED_NODE_SNAPSHOT_TYPE" with the proper type]
+    expected: FAIL
+
+  [Document interface: calling createNSResolver(Node) on xmlDoc with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [XPathResult interface: document.evaluate("//*", document.body) must inherit property "booleanValue" with the proper type]
+    expected: FAIL
+
+  [XPathResult interface: constant ORDERED_NODE_SNAPSHOT_TYPE on interface prototype object]
+    expected: FAIL
+
+  [Document interface: calling createExpression(DOMString, XPathNSResolver) on xmlDoc with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [XPathExpression interface object name]
+    expected: FAIL
+
+  [XPathResult interface: attribute snapshotLength]
+    expected: FAIL
+
+  [XPathEvaluator interface object length]
+    expected: FAIL
+
+  [XPathResult interface: document.evaluate("//*", document.body) must inherit property "STRING_TYPE" with the proper type]
+    expected: FAIL
+
+  [Document interface: xmlDoc must inherit property "evaluate(DOMString, Node, XPathNSResolver, unsigned short, XPathResult)" with the proper type]
+    expected: FAIL
+
+  [XPathResult interface: constant UNORDERED_NODE_SNAPSHOT_TYPE on interface object]
+    expected: FAIL
+
+  [XPathResult interface: document.evaluate("//*", document.body) must inherit property "stringValue" with the proper type]
+    expected: FAIL
+
+  [XPathResult interface: attribute invalidIteratorState]
+    expected: FAIL
+
+  [XPathResult interface: document.evaluate("//*", document.body) must inherit property "singleNodeValue" with the proper type]
+    expected: FAIL
+
+  [XPathResult interface: constant ORDERED_NODE_ITERATOR_TYPE on interface object]
+    expected: FAIL
+
+  [XPathEvaluator interface: new XPathEvaluator() must inherit property "evaluate(DOMString, Node, XPathNSResolver, unsigned short, XPathResult)" with the proper type]
+    expected: FAIL
+
+  [XPathResult interface: attribute numberValue]
+    expected: FAIL
+
+  [XPathResult interface: constant BOOLEAN_TYPE on interface prototype object]
+    expected: FAIL
+
+  [XPathResult interface: document.evaluate("//*", document.body) must inherit property "NUMBER_TYPE" with the proper type]
+    expected: FAIL
+
+  [XPathEvaluator interface object name]
+    expected: FAIL
+
+  [XPathResult interface: document.evaluate("//*", document.body) must inherit property "ORDERED_NODE_SNAPSHOT_TYPE" with the proper type]
+    expected: FAIL
+
+  [XPathEvaluator interface: calling evaluate(DOMString, Node, XPathNSResolver, unsigned short, XPathResult) on new XPathEvaluator() with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [XPathExpression interface object length]
+    expected: FAIL
+
+  [Stringification of new XPathEvaluator()]
+    expected: FAIL
+
+  [XPathResult interface: constant ORDERED_NODE_SNAPSHOT_TYPE on interface object]
+    expected: FAIL
+
+  [XPathEvaluator interface: operation evaluate(DOMString, Node, XPathNSResolver, unsigned short, XPathResult)]
+    expected: FAIL
+
+  [XPathResult interface: document.evaluate("//*", document.body) must inherit property "resultType" with the proper type]
+    expected: FAIL
+
+  [XPathResult interface: constant ANY_UNORDERED_NODE_TYPE on interface object]
+    expected: FAIL
+
+  [XPathExpression must be primary interface of document.createExpression("//*")]
+    expected: FAIL
+
+  [XPathResult interface: constant NUMBER_TYPE on interface prototype object]
+    expected: FAIL
+
+  [Document interface: calling evaluate(DOMString, Node, XPathNSResolver, unsigned short, XPathResult) on xmlDoc with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [XPathEvaluator must be primary interface of new XPathEvaluator()]
+    expected: FAIL
+
+  [XPathResult interface: operation iterateNext()]
+    expected: FAIL
+
+  [XPathEvaluator interface: new XPathEvaluator() must inherit property "createNSResolver(Node)" with the proper type]
+    expected: FAIL
+
+  [XPathResult interface: document.evaluate("//*", document.body) must inherit property "iterateNext()" with the proper type]
+    expected: FAIL
+
+  [XPathResult interface: constant UNORDERED_NODE_ITERATOR_TYPE on interface object]
+    expected: FAIL
+
+  [XPathResult interface: constant ANY_TYPE on interface object]
+    expected: FAIL
+
+  [XPathResult interface: constant FIRST_ORDERED_NODE_TYPE on interface object]
+    expected: FAIL
+
+  [XPathResult interface: constant STRING_TYPE on interface prototype object]
+    expected: FAIL
+
+  [XPathEvaluator interface: calling createNSResolver(Node) on new XPathEvaluator() with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [XPathResult interface: document.evaluate("//*", document.body) must inherit property "FIRST_ORDERED_NODE_TYPE" with the proper type]
+    expected: FAIL
+
+  [XPathExpression interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [XPathEvaluator interface: existence and properties of interface prototype object]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index 8773af99c82..62c36a4da9a 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -312,15 +312,27 @@
   [<iframe>: separate response Content-Type: */* text/html]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
+  [<iframe>: combined response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
+  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: */* text/html]
+  [<iframe>: combined response Content-Type: text/html */*]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
+  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html */*]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain */*]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index 279734168dc..2003288747e 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -56,6 +56,9 @@
   [separate text/javascript x/x]
     expected: FAIL
 
-  [separate text/javascript;charset=windows-1252  text/javascript]
+  [separate text/javascript;charset=windows-1252 error text/javascript]
+    expected: FAIL
+
+  [separate text/javascript ]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
index 87c807a49ff..ef3edb78985 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,3 +11,6 @@
   [X-Content-Type-Options%3A%20nosniff%0C]
     expected: FAIL
 
+  [X-Content-Type-Options%3A%20%22nosniFF%22]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/sec-metadata/redirect/redirect-https-downgrade.tentative.sub.html.ini b/tests/wpt/metadata/fetch/sec-metadata/redirect/redirect-https-downgrade.tentative.sub.html.ini
index cffcb484703..b55e50b270b 100644
--- a/tests/wpt/metadata/fetch/sec-metadata/redirect/redirect-https-downgrade.tentative.sub.html.ini
+++ b/tests/wpt/metadata/fetch/sec-metadata/redirect/redirect-https-downgrade.tentative.sub.html.ini
@@ -1,5 +1,4 @@
 [redirect-https-downgrade.tentative.sub.html]
-  expected: ERROR
   [Https downgrade fetch() api => No headers]
     expected: NOTRUN
 
@@ -9,3 +8,6 @@
   [Https downgrade embed => No headers]
     expected: TIMEOUT
 
+  [redirect-https-downgrade]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
deleted file mode 100644
index 87b07c3e670..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
new file mode 100644
index 00000000000..51f8272a6de
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_3.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
new file mode 100644
index 00000000000..385376c7321
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_4.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
deleted file mode 100644
index 16fa2c5cfc1..00000000000
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[creating_browsing_context_test_01.html]
-  [first argument: absolute url]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/media_fragment_seek.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/media_fragment_seek.html.ini
new file mode 100644
index 00000000000..b5a27414b21
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/media_fragment_seek.html.ini
@@ -0,0 +1,4 @@
+[media_fragment_seek.html]
+  [Video should seek to time specified in media fragment syntax]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/forms/autofocus/autofocus-on-stable-document.html.ini b/tests/wpt/metadata/html/semantics/forms/autofocus/autofocus-on-stable-document.html.ini
new file mode 100644
index 00000000000..6e3cb66e530
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/forms/autofocus/autofocus-on-stable-document.html.ini
@@ -0,0 +1,4 @@
+[autofocus-on-stable-document.html]
+  [Autofocus should work if an element with autofocus is inserted into a document which was loaded some time ago.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/forms/autofocus/first-reconnected.html.ini b/tests/wpt/metadata/html/semantics/forms/autofocus/first-reconnected.html.ini
new file mode 100644
index 00000000000..706419d10e5
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/forms/autofocus/first-reconnected.html.ini
@@ -0,0 +1,4 @@
+[first-reconnected.html]
+  [The second autofocus element wins if the first autofocus element was disconnected and reconnected before flushing the autofocus candidates.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/forms/autofocus/first-when-later-but-before.html.ini b/tests/wpt/metadata/html/semantics/forms/autofocus/first-when-later-but-before.html.ini
index 14e8e7a41a9..ccfed6e9458 100644
--- a/tests/wpt/metadata/html/semantics/forms/autofocus/first-when-later-but-before.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/autofocus/first-when-later-but-before.html.ini
@@ -2,3 +2,6 @@
   [The temporally first autofocus in the document wins, even if an element is inserted later that is previous in the document tree]
     expected: FAIL
 
+  [The temporally first autofocus in the document wins, even if an element is inserted later that is previous in the document tree.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/forms/autofocus/first-when-later.html.ini b/tests/wpt/metadata/html/semantics/forms/autofocus/first-when-later.html.ini
index 54f8a845b52..5e21b9580c4 100644
--- a/tests/wpt/metadata/html/semantics/forms/autofocus/first-when-later.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/autofocus/first-when-later.html.ini
@@ -2,3 +2,6 @@
   [The first autofocus in the document wins, even if elements are inserted later]
     expected: FAIL
 
+  [The first autofocus in the document wins, even if elements are inserted later.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/forms/autofocus/first.html.ini b/tests/wpt/metadata/html/semantics/forms/autofocus/first.html.ini
index 9d0cf6ce24c..006e1c7bfc4 100644
--- a/tests/wpt/metadata/html/semantics/forms/autofocus/first.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/autofocus/first.html.ini
@@ -2,3 +2,6 @@
   [The first autofocus in the document wins]
     expected: FAIL
 
+  [The first autofocus element in the document should win.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/forms/autofocus/focusable-area-in-top-document.html.ini b/tests/wpt/metadata/html/semantics/forms/autofocus/focusable-area-in-top-document.html.ini
new file mode 100644
index 00000000000..e378aa9546e
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/forms/autofocus/focusable-area-in-top-document.html.ini
@@ -0,0 +1,4 @@
+[focusable-area-in-top-document.html]
+  [If topDocument's focused area is not topDocument, autofocus is not processed.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/forms/autofocus/queue-non-focusable.html.ini b/tests/wpt/metadata/html/semantics/forms/autofocus/queue-non-focusable.html.ini
new file mode 100644
index 00000000000..316185a1ce3
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/forms/autofocus/queue-non-focusable.html.ini
@@ -0,0 +1,4 @@
+[queue-non-focusable.html]
+  [If the first autofocus element is not focusable, but becomes focusable before a frame, it should be focused.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/forms/autofocus/skip-document-with-fragment.html.ini b/tests/wpt/metadata/html/semantics/forms/autofocus/skip-document-with-fragment.html.ini
new file mode 100644
index 00000000000..c12c0f8ae48
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/forms/autofocus/skip-document-with-fragment.html.ini
@@ -0,0 +1,4 @@
+[skip-document-with-fragment.html]
+  [Autofocus elements in iframed documents with URL fragments should be skipped.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/forms/autofocus/skip-non-focusable.html.ini b/tests/wpt/metadata/html/semantics/forms/autofocus/skip-non-focusable.html.ini
new file mode 100644
index 00000000000..a357d92b7c7
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/forms/autofocus/skip-non-focusable.html.ini
@@ -0,0 +1,4 @@
+[skip-non-focusable.html]
+  [Non-focusable autofocus element is skipped.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/forms/autofocus/spin-by-blocking-style-sheet.html.ini b/tests/wpt/metadata/html/semantics/forms/autofocus/spin-by-blocking-style-sheet.html.ini
new file mode 100644
index 00000000000..4805d3e402b
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/forms/autofocus/spin-by-blocking-style-sheet.html.ini
@@ -0,0 +1,5 @@
+[spin-by-blocking-style-sheet.html]
+  expected: TIMEOUT
+  [Script-blocking style sheet should pause flushing autofocus candidates.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/html/semantics/forms/autofocus/update-the-rendering.html.ini b/tests/wpt/metadata/html/semantics/forms/autofocus/update-the-rendering.html.ini
new file mode 100644
index 00000000000..72932af0b91
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/forms/autofocus/update-the-rendering.html.ini
@@ -0,0 +1,5 @@
+[update-the-rendering.html]
+  expected: TIMEOUT
+  ["Flush autofocus candidates" should be happen after the first animation frame callbacks, and before a resize event in the next iteration of window event loop.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-validity-rangeOverflow.html.ini b/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-validity-rangeOverflow.html.ini
index 78f8de7d50a..788fc522460 100644
--- a/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-validity-rangeOverflow.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-validity-rangeOverflow.html.ini
@@ -225,3 +225,6 @@
   [[INPUT in DATETIME-LOCAL status\] The value is greater than max(Year is 10000 should be valid)]
     expected: FAIL
 
+  [[INPUT in NUMBER status\] The value is greater than max(special floating number)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-validity-rangeUnderflow.html.ini b/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-validity-rangeUnderflow.html.ini
index 851c76eeab1..351a2044700 100644
--- a/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-validity-rangeUnderflow.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-validity-rangeUnderflow.html.ini
@@ -219,3 +219,6 @@
   [[INPUT in DATETIME-LOCAL status\] The value is greater than max]
     expected: FAIL
 
+  [[INPUT in NUMBER status\] The value is less than min(special floating number)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-validity-stepMismatch.html.ini b/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-validity-stepMismatch.html.ini
index 4aeb80e612a..018bd5786f4 100644
--- a/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-validity-stepMismatch.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-validity-stepMismatch.html.ini
@@ -84,3 +84,9 @@
   [[INPUT in NUMBER status\] The value must mismatch the step]
     expected: FAIL
 
+  [[INPUT in NUMBER status\] The step attribute is not set and the value attribute is a floating number]
+    expected: FAIL
+
+  [[INPUT in NUMBER status\] The value attribute is empty string]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-submission-algorithm.html.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-submission-algorithm.html.ini
index 702af61a3c4..127392316de 100644
--- a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-submission-algorithm.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-submission-algorithm.html.ini
@@ -1,11 +1,7 @@
 [form-submission-algorithm.html]
-  expected: TIMEOUT
   [If form's firing submission events is true, then return; 'submit' event]
     expected: FAIL
 
   [If form's firing submission events is true, then return; 'invalid' event]
     expected: FAIL
 
-  [Cannot navigate (after constructing the entry list)]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..c194d827e38
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-http.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..46f2b68fd65
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[cross-http.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..56c2d9c64f1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-http.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..9c5d31868b5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-https.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..bfbb8ae7066
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[cross-https.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..f77949cc3f7
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-https.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..211a87d3a1f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-http.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..d9447183891
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[same-http.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..53959b4183b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-http.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..04d531b6b0e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-https.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..494b2e3e13d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[same-https.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..1ee4f68d38d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-https.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..fe1b0fb9f90
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-http.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..a4473db2774
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[cross-http.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..d259098cd80
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-http.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..d4f814d7e1a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-https.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..784cf56b93d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[cross-https.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..181bfe092b1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-https.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..2c8c363cc58
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-http.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects omitted for img-tag to same-http origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c8b0b1f0c54
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[same-http.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..c0c5af9d198
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-http.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..c19cd54f3dd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-https.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..eb72ba556a6
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[same-https.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..822b58244e0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-https.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..1a90831e924
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-http.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..f3940988185
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[cross-http.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..bc3d2cd1e26
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-http.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..1c6e9fdc0ce
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-https.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..e06db34b1ff
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[cross-https.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..98fd156c393
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-https.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..211a87d3a1f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-http.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..d9447183891
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[same-http.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..fd28ff237aa
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-http.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..0620d7a5a4c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-https.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..3599926dfc4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[same-https.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..7c8b1a1c741
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-https.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..1a90831e924
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-http.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..f3940988185
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[cross-http.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..bc3d2cd1e26
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-http.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..1c6e9fdc0ce
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-https.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..e06db34b1ff
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[cross-https.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..98fd156c393
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-https.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..4100a123a1b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-http.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..dd5bda1579d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[same-http.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..fd28ff237aa
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-http.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..0620d7a5a4c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-https.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..3599926dfc4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[same-https.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..7c8b1a1c741
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-https.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..fe1b0fb9f90
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-http.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..a4473db2774
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[cross-http.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..d259098cd80
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-http.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..d4f814d7e1a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-https.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..784cf56b93d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[cross-https.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..181bfe092b1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-https.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..211a87d3a1f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-http.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..d9447183891
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[same-http.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..c0c5af9d198
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-http.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..822b58244e0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-https.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..1a90831e924
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-http.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..f3940988185
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[cross-http.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..bc3d2cd1e26
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-http.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..1c6e9fdc0ce
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-https.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..e06db34b1ff
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[cross-https.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..98fd156c393
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-https.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..211a87d3a1f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-http.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..d9447183891
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[same-http.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..fd28ff237aa
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-http.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..0620d7a5a4c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-https.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..3599926dfc4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[same-https.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..7c8b1a1c741
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-https.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..1a90831e924
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-http.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..f3940988185
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[cross-http.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..bc3d2cd1e26
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-http.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..1c6e9fdc0ce
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-https.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..e06db34b1ff
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[cross-https.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..98fd156c393
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-https.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..4100a123a1b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-http.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..dd5bda1579d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[same-http.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..fd28ff237aa
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-http.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..0620d7a5a4c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-https.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..3599926dfc4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[same-https.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..7c8b1a1c741
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-https.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..c194d827e38
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-http.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..46f2b68fd65
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[cross-http.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..56c2d9c64f1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-http.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..9c5d31868b5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-https.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..bfbb8ae7066
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[cross-https.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..f77949cc3f7
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-https.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..211a87d3a1f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-http.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..d9447183891
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[same-http.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..53959b4183b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-http.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..04d531b6b0e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-https.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..494b2e3e13d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[same-https.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..1ee4f68d38d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-https.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..c194d827e38
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-http.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..46f2b68fd65
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[cross-http.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..56c2d9c64f1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-http.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..9c5d31868b5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-https.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..bfbb8ae7066
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[cross-https.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..f77949cc3f7
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[cross-https.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..211a87d3a1f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-http.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..d9447183891
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[same-http.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..53959b4183b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-http.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..04d531b6b0e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-https.keep-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..494b2e3e13d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,5 @@
+[same-https.no-redirect.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..1ee4f68d38d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,5 @@
+[same-https.swap-origin.http.html]
+  expected: TIMEOUT
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..3d792c4afad
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..09d2d65d211
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[cross-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..c7e624f83f2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-http.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..9d2b936da93
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-https.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..2baaf093e91
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[cross-https.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..6fbf1667b8d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-https.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..37e1f75f066
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..82ffc69787e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..017dda0f39d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..af7a0aef4c2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-https.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..9db6958df9f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-https.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..420328972f0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-https.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..25a038541de
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,2 @@
+[cross-http.keep-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..74140791be9
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,2 @@
+[cross-http.no-redirect.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..2246f24c8e5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,2 @@
+[cross-http.swap-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..b1c78d9f900
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,2 @@
+[cross-https.keep-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..ddcac5363f5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,2 @@
+[cross-https.no-redirect.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..ccdb0672911
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,2 @@
+[cross-https.swap-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..2ef9bb3125d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,2 @@
+[same-http.keep-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c20cd1f853f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,2 @@
+[same-http.no-redirect.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..6c30b034106
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,2 @@
+[same-http.swap-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..6a19cec8f34
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,2 @@
+[same-https.keep-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..09ce0ba8f5b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,2 @@
+[same-https.no-redirect.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..8a2333cfe1d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,2 @@
+[same-https.swap-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..d504364cd66
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..5960a16e8a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[cross-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..ce8730853a1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-http.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..e4f7468d2f3
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-https.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..9b13306ab27
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[cross-https.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..f7ff97ef2e1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-https.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..2ed4a610b1b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..854bdaaae87
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..1566810adc6
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..78b04936326
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-https.keep-origin.http.html]
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c9765708e4e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..696faf157ff
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-https.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..41efbaa64d7
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..68bde792a04
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..2d7cf8eae9e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..5f5bde466bf
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..697b1c45e29
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..281f2b968ea
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..9f3259468a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..abfd4e5a022
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..e26de23b9f1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..ebdb0e600dd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..6e6321f5809
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..6f1817b75a0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..71546d2db87
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..da0fa8bf260
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..38dade49ba3
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..da70e9cc9bd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..01b669910d2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..eeacd36ea1d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..41efbaa64d7
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..68bde792a04
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..2d7cf8eae9e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..5f5bde466bf
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..697b1c45e29
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..281f2b968ea
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..9f3259468a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..abfd4e5a022
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..e26de23b9f1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..ebdb0e600dd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..6e6321f5809
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..6f1817b75a0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..45a5f36a4cf
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..8ed3e17262e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..5fbb2a57f68
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..5e33597fc61
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..43b811027e0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..03e0b9807f6
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..dff03f99b98
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..a9ec4e797b4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..044afe14bf4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..1769b2580b4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [Referrer Policy: Expects omitted for sharedworker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..e529a4801cd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects omitted for sharedworker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..0d9c9ff0afa
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..3d593d8b0b9
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..79eae6e3b9d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..2911a9e60a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..5ea4a082de3
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..280a8921247
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..37e1f75f066
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..82ffc69787e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..9abdc225d4a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..d204df6ff1e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..837ba368f4d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..0c4227c0aff
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..2ef9bb3125d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,2 @@
+[same-http.keep-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c20cd1f853f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,2 @@
+[same-http.no-redirect.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..358acfa9e3d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..88098c53a70
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..fdc78287b2f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..1ef2b4acd86
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..f8a94a488bd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..b5f9a3e23c4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..2ed4a610b1b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..854bdaaae87
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..dc161000188
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..99de401fdb1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..5ac598c79b4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..f82362f5401
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..9f3259468a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..abfd4e5a022
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..71546d2db87
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..da0fa8bf260
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..38dade49ba3
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..da70e9cc9bd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..01b669910d2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..eeacd36ea1d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..9f3259468a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..abfd4e5a022
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..0d9c9ff0afa
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..3d593d8b0b9
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..79eae6e3b9d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..2911a9e60a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..5ea4a082de3
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..280a8921247
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..e821f119755
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..d52522e6f1b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for fetch to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..9abdc225d4a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..d204df6ff1e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..837ba368f4d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..0c4227c0aff
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/fetch/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..358acfa9e3d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..88098c53a70
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..fdc78287b2f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..1ef2b4acd86
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..f8a94a488bd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..b5f9a3e23c4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..a51b9ca809f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..120396a21dc
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..dc161000188
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..99de401fdb1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..5ac598c79b4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..f82362f5401
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..10ed4751d38
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for sharedworker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..3f3d2028ec1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for sharedworker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..db5928d7021
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for worker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..b53b10f4a28
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for worker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..c332d93674e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for worker-module to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..e56c7152d59
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for worker-module to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..37e1f75f066
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..82ffc69787e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..2ef9bb3125d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,2 @@
+[same-http.keep-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c20cd1f853f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,2 @@
+[same-http.no-redirect.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..45a5f36a4cf
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..8ed3e17262e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..5fbb2a57f68
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..5e33597fc61
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..43b811027e0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..2ed4a610b1b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..854bdaaae87
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..03e0b9807f6
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..044afe14bf4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..9f3259468a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..abfd4e5a022
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..71546d2db87
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..da0fa8bf260
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..38dade49ba3
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..da70e9cc9bd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..01b669910d2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..eeacd36ea1d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..9f3259468a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..abfd4e5a022
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..0d9c9ff0afa
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..3d593d8b0b9
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..79eae6e3b9d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..2911a9e60a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..5ea4a082de3
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..280a8921247
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..37e1f75f066
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..82ffc69787e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..9abdc225d4a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..d204df6ff1e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..837ba368f4d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..0c4227c0aff
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..2ef9bb3125d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,2 @@
+[same-http.keep-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c20cd1f853f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,2 @@
+[same-http.no-redirect.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..358acfa9e3d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..88098c53a70
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..fdc78287b2f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..1ef2b4acd86
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..f8a94a488bd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..b5f9a3e23c4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..2ed4a610b1b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..854bdaaae87
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..dc161000188
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..99de401fdb1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..5ac598c79b4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..f82362f5401
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..9f3259468a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..abfd4e5a022
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..71546d2db87
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..da0fa8bf260
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..38dade49ba3
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..da70e9cc9bd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..01b669910d2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..eeacd36ea1d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..9f3259468a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..abfd4e5a022
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..0d9c9ff0afa
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..3d593d8b0b9
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..79eae6e3b9d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..2911a9e60a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..5ea4a082de3
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..280a8921247
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..e821f119755
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..d52522e6f1b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for fetch to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..9abdc225d4a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..d204df6ff1e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..837ba368f4d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..0c4227c0aff
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..358acfa9e3d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..88098c53a70
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..fdc78287b2f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..1ef2b4acd86
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..f8a94a488bd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..b5f9a3e23c4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..a51b9ca809f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..120396a21dc
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..dc161000188
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..99de401fdb1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..5ac598c79b4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..f82362f5401
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..10ed4751d38
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for sharedworker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..3f3d2028ec1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for sharedworker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..db5928d7021
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for worker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..b53b10f4a28
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for worker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..c332d93674e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for worker-module to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..e56c7152d59
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for worker-module to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..3d792c4afad
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..09d2d65d211
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[cross-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..c7e624f83f2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-http.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..9d2b936da93
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-https.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..2baaf093e91
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[cross-https.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..6fbf1667b8d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-https.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..37e1f75f066
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..82ffc69787e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..017dda0f39d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..af7a0aef4c2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-https.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..9db6958df9f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-https.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..420328972f0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-https.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..25a038541de
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,2 @@
+[cross-http.keep-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..74140791be9
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,2 @@
+[cross-http.no-redirect.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..2246f24c8e5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,2 @@
+[cross-http.swap-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..b1c78d9f900
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,2 @@
+[cross-https.keep-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..ddcac5363f5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,2 @@
+[cross-https.no-redirect.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..ccdb0672911
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,2 @@
+[cross-https.swap-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..2ef9bb3125d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,2 @@
+[same-http.keep-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c20cd1f853f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,2 @@
+[same-http.no-redirect.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..6c30b034106
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,2 @@
+[same-http.swap-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..6a19cec8f34
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,2 @@
+[same-https.keep-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..09ce0ba8f5b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,2 @@
+[same-https.no-redirect.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..8a2333cfe1d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,2 @@
+[same-https.swap-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..d504364cd66
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..5960a16e8a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[cross-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..ce8730853a1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-http.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..e4f7468d2f3
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-https.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..9b13306ab27
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[cross-https.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..f7ff97ef2e1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-https.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..2ed4a610b1b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..854bdaaae87
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..1566810adc6
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..78b04936326
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-https.keep-origin.http.html]
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c9765708e4e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..696faf157ff
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-https.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..41efbaa64d7
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..68bde792a04
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..2d7cf8eae9e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..5f5bde466bf
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..697b1c45e29
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..281f2b968ea
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..9f3259468a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..abfd4e5a022
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..e26de23b9f1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..ebdb0e600dd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..6e6321f5809
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..6f1817b75a0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..71546d2db87
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..da0fa8bf260
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..38dade49ba3
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..da70e9cc9bd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..01b669910d2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..eeacd36ea1d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..41efbaa64d7
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..68bde792a04
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..2d7cf8eae9e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..5f5bde466bf
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..697b1c45e29
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..281f2b968ea
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..9f3259468a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..abfd4e5a022
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..e26de23b9f1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..ebdb0e600dd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..6e6321f5809
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..6f1817b75a0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..3d792c4afad
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..09d2d65d211
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[cross-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..c7e624f83f2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-http.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..9d2b936da93
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-https.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..2baaf093e91
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[cross-https.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..6fbf1667b8d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-https.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..37e1f75f066
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..82ffc69787e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..017dda0f39d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/same-http.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..af7a0aef4c2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/same-https.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-https.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..9db6958df9f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/same-https.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-https.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..420328972f0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/fetch/same-https.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-https.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..25a038541de
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,2 @@
+[cross-http.keep-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..74140791be9
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,2 @@
+[cross-http.no-redirect.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..2246f24c8e5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,2 @@
+[cross-http.swap-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..b1c78d9f900
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,2 @@
+[cross-https.keep-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..ddcac5363f5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,2 @@
+[cross-https.no-redirect.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..ccdb0672911
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,2 @@
+[cross-https.swap-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..2ef9bb3125d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,2 @@
+[same-http.keep-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c20cd1f853f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,2 @@
+[same-http.no-redirect.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..6c30b034106
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,2 @@
+[same-http.swap-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..6a19cec8f34
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,2 @@
+[same-https.keep-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..09ce0ba8f5b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,2 @@
+[same-https.no-redirect.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..8a2333cfe1d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,2 @@
+[same-https.swap-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..d504364cd66
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..5960a16e8a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[cross-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..ce8730853a1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-http.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..e4f7468d2f3
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-https.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..9b13306ab27
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[cross-https.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..f7ff97ef2e1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-https.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..2ed4a610b1b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..854bdaaae87
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..1566810adc6
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..78b04936326
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-https.keep-origin.http.html]
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c9765708e4e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..696faf157ff
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-https.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..41efbaa64d7
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..68bde792a04
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..2d7cf8eae9e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..5f5bde466bf
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..697b1c45e29
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..281f2b968ea
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..9f3259468a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..abfd4e5a022
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..e26de23b9f1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..ebdb0e600dd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..6e6321f5809
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..6f1817b75a0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..71546d2db87
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..da0fa8bf260
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..38dade49ba3
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..da70e9cc9bd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/worker-module/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/worker-module/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..01b669910d2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/worker-module/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/worker-module/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/worker-module/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..eeacd36ea1d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/worker-module/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..41efbaa64d7
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..68bde792a04
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..2d7cf8eae9e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..5f5bde466bf
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..697b1c45e29
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..281f2b968ea
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..9f3259468a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..abfd4e5a022
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..e26de23b9f1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..ebdb0e600dd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..6e6321f5809
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..6f1817b75a0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.http-rp/unset/xhr/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..3d792c4afad
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..09d2d65d211
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[cross-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..c7e624f83f2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-http.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..9d2b936da93
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-https.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..2baaf093e91
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[cross-https.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..6fbf1667b8d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-https.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..37e1f75f066
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..82ffc69787e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..017dda0f39d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..af7a0aef4c2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-https.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..9db6958df9f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-https.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..420328972f0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-https.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..25a038541de
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,2 @@
+[cross-http.keep-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..74140791be9
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,2 @@
+[cross-http.no-redirect.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..2246f24c8e5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,2 @@
+[cross-http.swap-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..b1c78d9f900
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,2 @@
+[cross-https.keep-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..ddcac5363f5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,2 @@
+[cross-https.no-redirect.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..ccdb0672911
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,2 @@
+[cross-https.swap-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..2ef9bb3125d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,2 @@
+[same-http.keep-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c20cd1f853f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,2 @@
+[same-http.no-redirect.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..6c30b034106
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,2 @@
+[same-http.swap-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..6a19cec8f34
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,2 @@
+[same-https.keep-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..09ce0ba8f5b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,2 @@
+[same-https.no-redirect.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..8a2333cfe1d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,2 @@
+[same-https.swap-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..41efbaa64d7
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..68bde792a04
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..2d7cf8eae9e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..5f5bde466bf
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..697b1c45e29
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..281f2b968ea
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..9f3259468a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..abfd4e5a022
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..e26de23b9f1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..ebdb0e600dd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..6e6321f5809
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..6f1817b75a0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..71546d2db87
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..da0fa8bf260
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..38dade49ba3
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..da70e9cc9bd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..01b669910d2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..eeacd36ea1d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..41efbaa64d7
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..68bde792a04
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..2d7cf8eae9e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..5f5bde466bf
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..697b1c45e29
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..281f2b968ea
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..9f3259468a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..abfd4e5a022
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..e26de23b9f1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..ebdb0e600dd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..6e6321f5809
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..6f1817b75a0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..1769b2580b4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [Referrer Policy: Expects omitted for sharedworker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..e529a4801cd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects omitted for sharedworker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..0d9c9ff0afa
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..3d593d8b0b9
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..79eae6e3b9d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..2911a9e60a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..5ea4a082de3
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..280a8921247
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..37e1f75f066
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..82ffc69787e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..9abdc225d4a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..d204df6ff1e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..837ba368f4d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..0c4227c0aff
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..2ef9bb3125d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,2 @@
+[same-http.keep-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c20cd1f853f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,2 @@
+[same-http.no-redirect.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..9f3259468a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..abfd4e5a022
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..71546d2db87
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..da0fa8bf260
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..38dade49ba3
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..da70e9cc9bd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..01b669910d2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..eeacd36ea1d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..9f3259468a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..abfd4e5a022
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..0d9c9ff0afa
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..3d593d8b0b9
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..79eae6e3b9d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..2911a9e60a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..5ea4a082de3
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..280a8921247
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..e821f119755
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..d52522e6f1b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for fetch to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..9abdc225d4a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..d204df6ff1e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..837ba368f4d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..0c4227c0aff
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/fetch/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..10ed4751d38
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for sharedworker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..3f3d2028ec1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for sharedworker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/worker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/worker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..db5928d7021
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/worker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for worker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/worker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/worker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..b53b10f4a28
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/worker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for worker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/worker-module/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/worker-module/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..c332d93674e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/worker-module/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for worker-module to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/worker-module/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/worker-module/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..e56c7152d59
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/origin/worker-module/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for worker-module to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/fetch/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/fetch/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..37e1f75f066
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/fetch/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/fetch/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/fetch/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..82ffc69787e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/fetch/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..2ef9bb3125d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,2 @@
+[same-http.keep-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c20cd1f853f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,2 @@
+[same-http.no-redirect.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..9f3259468a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..abfd4e5a022
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..71546d2db87
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..da0fa8bf260
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..38dade49ba3
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..da70e9cc9bd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/worker-module/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/worker-module/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..01b669910d2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/worker-module/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/worker-module/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/worker-module/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..eeacd36ea1d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/worker-module/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/xhr/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/xhr/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..9f3259468a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/xhr/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/xhr/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/xhr/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..abfd4e5a022
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/same-origin/xhr/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..0d9c9ff0afa
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..3d593d8b0b9
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..79eae6e3b9d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..2911a9e60a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..5ea4a082de3
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..280a8921247
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..37e1f75f066
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..82ffc69787e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..9abdc225d4a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..d204df6ff1e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..837ba368f4d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..0c4227c0aff
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..2ef9bb3125d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,2 @@
+[same-http.keep-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c20cd1f853f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,2 @@
+[same-http.no-redirect.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..9f3259468a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..abfd4e5a022
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..71546d2db87
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..da0fa8bf260
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..38dade49ba3
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..da70e9cc9bd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..01b669910d2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..eeacd36ea1d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..9f3259468a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..abfd4e5a022
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..0d9c9ff0afa
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..3d593d8b0b9
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..79eae6e3b9d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..2911a9e60a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..5ea4a082de3
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..280a8921247
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..e821f119755
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..d52522e6f1b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for fetch to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..9abdc225d4a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..d204df6ff1e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..837ba368f4d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..0c4227c0aff
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..10ed4751d38
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for sharedworker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..3f3d2028ec1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for sharedworker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..db5928d7021
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for worker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..b53b10f4a28
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for worker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..c332d93674e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [Referrer Policy: Expects origin for worker-module to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..e56c7152d59
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [Referrer Policy: Expects origin for worker-module to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..3d792c4afad
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..09d2d65d211
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[cross-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..c7e624f83f2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-http.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..9d2b936da93
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-https.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..2baaf093e91
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[cross-https.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..6fbf1667b8d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-https.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..37e1f75f066
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..82ffc69787e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..017dda0f39d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..af7a0aef4c2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-https.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..9db6958df9f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-https.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..420328972f0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-https.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..25a038541de
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,2 @@
+[cross-http.keep-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..74140791be9
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,2 @@
+[cross-http.no-redirect.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..2246f24c8e5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,2 @@
+[cross-http.swap-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..b1c78d9f900
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,2 @@
+[cross-https.keep-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..ddcac5363f5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,2 @@
+[cross-https.no-redirect.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..ccdb0672911
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,2 @@
+[cross-https.swap-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..2ef9bb3125d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,2 @@
+[same-http.keep-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c20cd1f853f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,2 @@
+[same-http.no-redirect.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..6c30b034106
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,2 @@
+[same-http.swap-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..6a19cec8f34
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,2 @@
+[same-https.keep-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..09ce0ba8f5b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,2 @@
+[same-https.no-redirect.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..8a2333cfe1d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,2 @@
+[same-https.swap-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..41efbaa64d7
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..68bde792a04
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..2d7cf8eae9e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..5f5bde466bf
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..697b1c45e29
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..281f2b968ea
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..9f3259468a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..abfd4e5a022
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..e26de23b9f1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..ebdb0e600dd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..6e6321f5809
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..6f1817b75a0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..71546d2db87
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..da0fa8bf260
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..38dade49ba3
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..da70e9cc9bd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..01b669910d2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..eeacd36ea1d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..41efbaa64d7
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..68bde792a04
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..2d7cf8eae9e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..5f5bde466bf
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..697b1c45e29
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..281f2b968ea
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..9f3259468a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..abfd4e5a022
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..e26de23b9f1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..ebdb0e600dd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..6e6321f5809
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..6f1817b75a0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..3d792c4afad
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..09d2d65d211
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[cross-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..c7e624f83f2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-http.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..9d2b936da93
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-https.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..2baaf093e91
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[cross-https.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..6fbf1667b8d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[cross-https.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..37e1f75f066
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..82ffc69787e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..017dda0f39d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/same-http.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..af7a0aef4c2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/same-https.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-https.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..9db6958df9f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/same-https.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-https.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..420328972f0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/fetch/same-https.swap-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-https.swap-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..25a038541de
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,2 @@
+[cross-http.keep-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..74140791be9
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,2 @@
+[cross-http.no-redirect.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..2246f24c8e5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,2 @@
+[cross-http.swap-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..b1c78d9f900
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,2 @@
+[cross-https.keep-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..ddcac5363f5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,2 @@
+[cross-https.no-redirect.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..ccdb0672911
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,2 @@
+[cross-https.swap-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..2ef9bb3125d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,2 @@
+[same-http.keep-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c20cd1f853f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,2 @@
+[same-http.no-redirect.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..6c30b034106
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,2 @@
+[same-http.swap-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..6a19cec8f34
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,2 @@
+[same-https.keep-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..09ce0ba8f5b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,2 @@
+[same-https.no-redirect.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..8a2333cfe1d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,2 @@
+[same-https.swap-origin.http.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..41efbaa64d7
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..68bde792a04
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..2d7cf8eae9e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..5f5bde466bf
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..697b1c45e29
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..281f2b968ea
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..9f3259468a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..abfd4e5a022
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..e26de23b9f1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..ebdb0e600dd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..6e6321f5809
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..6f1817b75a0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/script-tag/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..71546d2db87
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..da0fa8bf260
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/worker-classic/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/worker-classic/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..38dade49ba3
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/worker-classic/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/worker-classic/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/worker-classic/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..da70e9cc9bd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/worker-classic/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/worker-module/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/worker-module/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..01b669910d2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/worker-module/same-http.keep-origin.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/worker-module/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/worker-module/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..eeacd36ea1d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/worker-module/same-http.no-redirect.http.html.ini
@@ -0,0 +1,13 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length < 4k is not stripped to an origin.]
+    expected: FAIL
+
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
+  [Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [`Referer` header with length == 4k is not stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/cross-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/cross-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..41efbaa64d7
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/cross-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/cross-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/cross-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..68bde792a04
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/cross-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/cross-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/cross-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..2d7cf8eae9e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/cross-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-http.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/cross-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/cross-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..5f5bde466bf
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/cross-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/cross-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/cross-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..697b1c45e29
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/cross-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/cross-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/cross-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..281f2b968ea
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/cross-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-https.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/same-http.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/same-http.keep-origin.http.html.ini
new file mode 100644
index 00000000000..9f3259468a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/same-http.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/same-http.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/same-http.no-redirect.http.html.ini
new file mode 100644
index 00000000000..abfd4e5a022
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/same-http.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/same-http.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/same-http.swap-origin.http.html.ini
new file mode 100644
index 00000000000..e26de23b9f1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/same-http.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-http.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/same-https.keep-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/same-https.keep-origin.http.html.ini
new file mode 100644
index 00000000000..ebdb0e600dd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/same-https.keep-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.keep-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/same-https.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/same-https.no-redirect.http.html.ini
new file mode 100644
index 00000000000..6e6321f5809
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/same-https.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.no-redirect.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/same-https.swap-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/same-https.swap-origin.http.html.ini
new file mode 100644
index 00000000000..6f1817b75a0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/gen/top.meta/unset/xhr/same-https.swap-origin.http.html.ini
@@ -0,0 +1,4 @@
+[same-https.swap-origin.http.html]
+  [`Referer` header with length > 4k is stripped to an origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
index a4d28f41d6d..c9649fc5e0d 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [insecure-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
index 5817eb0da4a..7daf2aa860b 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [insecure-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
index ce1aad083cc..8e319a8e648 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [insecure-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
index 8eb8b97559f..f5c95abd0f7 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
index 846abe7971d..e93a890a004 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
index 50e8f299aeb..e015df4f249 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
index bba23556c90..955ee280e2b 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [insecure-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
index 0d9b95c7b42..1435bba9191 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [insecure-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
index fe668d7d230..3317e69a9ab 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [insecure-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
index e5e190fd617..4527b3f7571 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
index 4816dc6a526..e953608b33f 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
index 35bed520d01..2d1e6e7ca18 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
index 38eb7f5c43f..c576c79d42d 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini
index 7258d796a23..c7fb336b158 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
index e7cfa52a277..ed0c8c56167 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin. (srcdoc iframe inherits parent)]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
index 58ad7a29a30..3a78a003c3b 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
index cafac22aa22..607ad0f9d8c 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
index 31bda0ed8c0..d14f62995ac 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
index 9ddd4e98f93..f4447f8834a 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin. (srcdoc iframe inherits parent)]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini
index 863cbd10329..6a892de51ce 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin. (overridden by srcdoc iframe)]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
index c25d6026762..d579f324554 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
index 98a9a3f7882..41751362a97 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
index 715a5623432..98b3c72fd5b 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
index e9f867552f2..52c8e1b32b0 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.ini
index f6cc5c8b478..5e309bc9d2b 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.ini
index 0187ec44fdf..3ddaef91ded 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html.ini
index c7a5821ace3..7c1d3380991 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.ini
index c33ac278441..b59fe1ad8f9 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.ini
index b591c591ad4..1b1e243ae8a 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.ini
index 9457b8acc54..b87138016af 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.ini
index 4b76a9b6851..a94920e8546 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-insecure.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.ini
index 49d74de2246..282082fe71d 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-insecure.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
index a508a5c8310..24fd6d5f003 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-insecure.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html.ini
index 53a47ae1f3e..4ee5eeee1a2 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-upgrade.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html.ini
index 97cdb7eb53e..de9d402eccc 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-upgrade.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
index 4842906dd23..5f52f17f0f2 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-insecure.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
index 5575d734735..0b2d4c0e8ba 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini
index 880256fbfe8..ecaef71c23e 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
index ec8fee6e5ae..304a1acf5f2 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
index 4a538cca739..9cdb290a309 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
index d94a3ae6a77..94f8d127e52 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
index 0db9a9cc7e8..2ac8ef7ad5f 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
index 7311f5838e1..21c6f9e0bf6 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini
index 126c3019d1a..20700689b97 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
index d9aeef5b1f3..f143e4f2171 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
index 6f3e7511748..b728ffadea0 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
index 56d95eea2f8..670539eff7b 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
index 5cea8df5908..0f023d2b28d 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.ini
index b39adaf343a..81884cc2da7 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.ini
index 66f332d95f3..f624910557c 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html.ini
index 812424da794..f1434c63c97 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin. (srcdoc iframe inherits parent)]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.ini
index 43d9bf5b700..fc08a7d2af2 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.ini
index ec967f22a89..badc456f6b2 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.ini
index 8670bf3e1b7..1a6cf370323 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.ini
index 4b76a9b6851..a94920e8546 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-insecure.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.ini
index 49d74de2246..282082fe71d 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-insecure.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
index 021cfd48f95..366f9276118 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-insecure.http.html]
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
index 31f412bd7a4..5d439aca2d4 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-insecure.http.html]
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html.ini
index 01a929705f3..5c00077ae37 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [cross-insecure.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html.ini
index 2ac654e6ab3..f02a1ab6d79 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [cross-insecure.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html.ini
index 5b7e2e1cf98..f52e0b7ad3b 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [cross-insecure.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
index c9a0fc65b6f..10748ab0524 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
index d80fca2621f..080a7dfeb38 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
index b76afe55301..4b67b47c096 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html.ini
index 12109c3e2f4..e4fa5fa3c6a 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-insecure.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html.ini
index bce94de5078..4ce5174baa4 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-insecure.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html.ini
index e0542354c35..12f71f35868 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-insecure.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
index bbf944474a7..6a81144c4cb 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
index 84111538613..8f926659261 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
index bc20341fcaf..160f683a330 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
index f89ac5ccb62..538ea7a5f9e 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [insecure-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
index 8f0b8d0489c..ada87b03af8 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [insecure-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
index 1f54b5c38e0..e4c2070160b 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [insecure-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
index c9a0fc65b6f..10748ab0524 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
index d80fca2621f..080a7dfeb38 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
index b76afe55301..4b67b47c096 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
index f66cc243c02..e4c72a4a8a7 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [insecure-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
index 31832cce8d4..5b171264ae0 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [insecure-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
index 28cad66eec8..22aa5f6125d 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [insecure-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
index bbf944474a7..6a81144c4cb 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
index 84111538613..8f926659261 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
index bc20341fcaf..160f683a330 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
index 06f6b638140..8f0bd4f2c93 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini
index 2946534ce7f..104fcccc0ec 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
index c51a2737ae8..a9f9146deb1 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
index 8456e54dcde..8b1dd57f8bd 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
index afc225cd19e..337af30e9a5 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
index 6faed8d67f7..28a48dff9f2 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
index 2c31558bba2..b3ea065bb25 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini
index bcf9dc8f58b..09acf89b576 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
index a405585e6b5..7aa7efc76a8 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
index 5c552e9b729..f5fb2c0da9f 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
index 21cc58e8d88..3a063c3fa57 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
index b37a1bbae83..3a5aec25199 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index dbd302fbd75..8c965580699 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -50,3 +50,9 @@
   [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[30\]\t1.9724091887474060e-1\t9.5236867666244507e-1\t7.5512775778770447e-1\t7.9289436569253091e-1\t3.8985999999999999e-3\n\t[60\]\t-2.2450675070285797e-1\t-5.8084785938262939e-1\t3.5634110867977142e-1\t6.1348441407448528e-1\t3.8985999999999999e-3\n\t[90\]\t-3.7808802723884583e-1\t-5.9811043739318848e-1\t2.2002241015434265e-1\t3.6786251568070089e-1\t3.8985999999999999e-3\n\t[120\]\t7.6881676912307739e-1\t9.4563448429107666e-1\t1.7681771516799927e-1\t1.8698315057805445e-1\t3.8985999999999999e-3\n\t[151\]\t5.4644601186737418e-4\t-4.1306272149085999e-2\t4.1852718160953373e-2\t1.0132291292202573e+0\t3.8985999999999999e-3\n\t...and 1419 more errors.\n\tMax AbsError of 1.0373208575716874e+22 at index of 39268.\n\t[39268\]\t-1.0373208575716874e+22\t-9.6925276517868042e-1\t1.0373208575716874e+22\t1.0702273904583173e+22\t3.8985999999999999e-3\n\tMax RelError of 1.0702273904583173e+22 at index of 39268.\n\t[39268\]\t-1.0373208575716874e+22\t-9.6925276517868042e-1\t1.0373208575716874e+22\t1.0702273904583173e+22\t3.8985999999999999e-3\n]
     expected: FAIL
 
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[30\]\t1.9724091887474060e-1\t9.5236867666244507e-1\t7.5512775778770447e-1\t7.9289436569253091e-1\t3.8985999999999999e-3\n\t[60\]\t-2.2450675070285797e-1\t-5.8084785938262939e-1\t3.5634110867977142e-1\t6.1348441407448528e-1\t3.8985999999999999e-3\n\t[90\]\t-3.7808802723884583e-1\t-5.9811043739318848e-1\t2.2002241015434265e-1\t3.6786251568070089e-1\t3.8985999999999999e-3\n\t[120\]\t7.6881676912307739e-1\t9.4563448429107666e-1\t1.7681771516799927e-1\t1.8698315057805445e-1\t3.8985999999999999e-3\n\t[151\]\t5.4644601186737418e-4\t-4.1306272149085999e-2\t4.1852718160953373e-2\t1.0132291292202573e+0\t3.8985999999999999e-3\n\t...and 1419 more errors.\n\tMax AbsError of 3.7861355458197831e+32 at index of 39268.\n\t[39268\]\t3.7861355458197831e+32\t-9.6925276517868042e-1\t3.7861355458197831e+32\t3.9062416758974261e+32\t3.8985999999999999e-3\n\tMax RelError of 3.9062416758974261e+32 at index of 39268.\n\t[39268\]\t3.7861355458197831e+32\t-9.6925276517868042e-1\t3.7861355458197831e+32\t3.9062416758974261e+32\t3.8985999999999999e-3\n]
+    expected: FAIL
+
+  [X SNR (-608.3912160578785 dB) is not greater than or equal to 65.737. Got -608.3912160578785.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webxr/xrSession_viewer_availability.https.html.ini b/tests/wpt/metadata/webxr/xrSession_viewer_availability.https.html.ini
index f7184958179..60474177872 100644
--- a/tests/wpt/metadata/webxr/xrSession_viewer_availability.https.html.ini
+++ b/tests/wpt/metadata/webxr/xrSession_viewer_availability.https.html.ini
@@ -2,3 +2,6 @@
   [Inline viewer support wtih no device]
     expected: FAIL
 
+  [Inline viewer support with no device]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/css/transition_calc_implicit.html.ini b/tests/wpt/mozilla/meta/css/transition_calc_implicit.html.ini
deleted file mode 100644
index dbea4f293ad..00000000000
--- a/tests/wpt/mozilla/meta/css/transition_calc_implicit.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[transition_calc_implicit.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex15-autoincrement.htm b/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex15-autoincrement.htm
index 87ea39ce3d2..c66b81548ad 100644
--- a/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex15-autoincrement.htm
+++ b/tests/wpt/web-platform-tests/IndexedDB/idbobjectstore_createIndex15-autoincrement.htm
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>IDBObjectStore.createIndex() - AutoIncrement in Compound Index</title>
+<meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="support.js"></script>
@@ -49,4 +50,57 @@
     },
     "Auto-Increment Primary Key"
   );
+
+  indexeddb_test(
+    function(t, db, txn) {
+      // Auto-increment
+      var store = db.createObjectStore("Store3", {keyPath: "id", autoIncrement: true});
+      store.createIndex("CompoundKey", ["num", "id", "other"]);
+
+      var num = 100;
+
+      // Add data to Store3 - valid keys
+      // Objects will be stored in Store3 and keys will get added
+      // to the CompoundKeys index.
+      store.put({num: num++, other: 0});
+      store.put({num: num++, other: [0]});
+
+      // Add data - missing key
+      // Objects will be stored in Store3 but keys won't get added to
+      // the CompoundKeys index because the 'other' keypath doesn't
+      // resolve to a value.
+      store.put({num: num++});
+
+      // Add data to Store3 - invalid keys
+      // Objects will be stored in Store3 but keys won't get added to
+      // the CompoundKeys index because the 'other' property values
+      // aren't valid keys.
+      store.put({num: num++, other: null});
+      store.put({num: num++, other: {}});
+      store.put({num: num++, other: [null]});
+      store.put({num: num++, other: [{}]});
+    },
+    function(t, db) {
+      var store = db.transaction("Store3", "readwrite").objectStore("Store3");
+      const keys = [];
+      let count;
+      store.count().onsuccess = t.step_func(e => { count = e.target.result; });
+      store.index("CompoundKey").openCursor().onsuccess = t.step_func(function(e) {
+        const cursor = e.target.result;
+        if (cursor !== null) {
+          keys.push(cursor.key);
+          cursor.continue();
+          return;
+        }
+
+        // Done iteration, check results.
+        assert_equals(count, 7, 'Expected all 7 records to be stored.');
+        assert_equals(keys.length, 2, 'Expected exactly two index entries.');
+        assert_array_equals(keys[0], [100, 1, 0]);
+        assert_object_equals(keys[1], [101, 2, [0]]);
+        t.done();
+      });
+    },
+    "Auto-Increment Primary Key - invalid key values elsewhere"
+  );
 </script>
diff --git a/tests/wpt/web-platform-tests/IndexedDB/transaction-relaxed-durability.tentative.any.js b/tests/wpt/web-platform-tests/IndexedDB/transaction-relaxed-durability.tentative.any.js
new file mode 100644
index 00000000000..c6a6f37ba9e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/IndexedDB/transaction-relaxed-durability.tentative.any.js
@@ -0,0 +1,39 @@
+// META: script=support-promises.js
+// META: timeout=long
+
+/**
+ * This file contains the webplatform smoke tests for the optional
+ * relaxedDurability parameter of the IndexedDB transaction API.
+ *
+ * @author enne@chromium.org
+ */
+
+// Smoke test optional parameter on IndexedDB.transaction.
+let cases = [
+  undefined,
+  {},
+  {relaxedDurability: false},
+  {relaxedDurability: true},
+];
+
+for (let i = 0; i < cases.length; ++i) {
+  promise_test(async testCase => {
+    const db = await createDatabase(testCase, db => {
+      createBooksStore(testCase, db);
+    });
+    const txn = db.transaction(['books'], 'readwrite', cases[i]);
+    const objectStore = txn.objectStore('books');
+    objectStore.put({isbn: 'one', title: 'title1'});
+    await promiseForTransaction(testCase, txn);
+
+    const txn2 = db.transaction(['books'], 'readonly');
+    const objectStore2 = txn2.objectStore('books');
+    const getTitle1 = objectStore2.get('one');
+    await promiseForTransaction(testCase, txn2);
+    assert_array_equals(
+        [getTitle1.result.title],
+        ['title1'],
+        'The title should match that which was put.');
+    db.close();
+  }, 'Committed data can be read back out: case ' + i);
+}
diff --git a/tests/wpt/web-platform-tests/bluetooth/adapter/adapter-absent-getAvailability.https.window.js b/tests/wpt/web-platform-tests/bluetooth/adapter/adapter-absent-getAvailability.https.window.js
index cec09c38b13..a9f540ecd34 100644
--- a/tests/wpt/web-platform-tests/bluetooth/adapter/adapter-absent-getAvailability.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/adapter/adapter-absent-getAvailability.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/adapter/adapter-added-getAvailability.https.window.js b/tests/wpt/web-platform-tests/bluetooth/adapter/adapter-added-getAvailability.https.window.js
index d5e9d1f2b6f..30c47201f07 100644
--- a/tests/wpt/web-platform-tests/bluetooth/adapter/adapter-added-getAvailability.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/adapter/adapter-added-getAvailability.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/adapter/adapter-powered-off-getAvailability.https.window.js b/tests/wpt/web-platform-tests/bluetooth/adapter/adapter-powered-off-getAvailability.https.window.js
index 8fe9265a46e..b760d4bc272 100644
--- a/tests/wpt/web-platform-tests/bluetooth/adapter/adapter-powered-off-getAvailability.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/adapter/adapter-powered-off-getAvailability.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/adapter/adapter-powered-on-getAvailability.https.window.js b/tests/wpt/web-platform-tests/bluetooth/adapter/adapter-powered-on-getAvailability.https.window.js
index 8b9256a4c35..f98a88eea9e 100644
--- a/tests/wpt/web-platform-tests/bluetooth/adapter/adapter-powered-on-getAvailability.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/adapter/adapter-powered-on-getAvailability.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/adapter/adapter-powered-on-off-on-getAvailability.https.window.js b/tests/wpt/web-platform-tests/bluetooth/adapter/adapter-powered-on-off-on-getAvailability.https.window.js
index b8b49121fc0..ac664a89812 100644
--- a/tests/wpt/web-platform-tests/bluetooth/adapter/adapter-powered-on-off-on-getAvailability.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/adapter/adapter-powered-on-off-on-getAvailability.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/adapter/adapter-removed-getAvailability.https.window.js b/tests/wpt/web-platform-tests/bluetooth/adapter/adapter-removed-getAvailability.https.window.js
index cc2c33d1d4c..00425aa56f2 100644
--- a/tests/wpt/web-platform-tests/bluetooth/adapter/adapter-removed-getAvailability.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/adapter/adapter-removed-getAvailability.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/adapter/cross-origin-iframe-getAvailability.sub.https.window.js b/tests/wpt/web-platform-tests/bluetooth/adapter/cross-origin-iframe-getAvailability.sub.https.window.js
index bf5e4226e08..ce633c63f98 100644
--- a/tests/wpt/web-platform-tests/bluetooth/adapter/cross-origin-iframe-getAvailability.sub.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/adapter/cross-origin-iframe-getAvailability.sub.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/characteristicProperties.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/characteristicProperties.https.window.js
index abe9f79ce26..5239accab97 100644
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/characteristicProperties.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/characteristicProperties.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptor/gen-characteristic-is-removed.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptor/gen-characteristic-is-removed.https.window.js
index 97256a45330..eb91e972c4e 100644
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptor/gen-characteristic-is-removed.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptor/gen-characteristic-is-removed.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptor/gen-descriptor-get-same-object.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptor/gen-descriptor-get-same-object.https.window.js
index 8847efab3c1..4cff64bbdad 100644
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptor/gen-descriptor-get-same-object.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptor/gen-descriptor-get-same-object.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptor/gen-service-is-removed.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptor/gen-service-is-removed.https.window.js
index b9dc92482ab..f5d1761994a 100644
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptor/gen-service-is-removed.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptor/gen-service-is-removed.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptors/gen-characteristic-is-removed-with-uuid.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptors/gen-characteristic-is-removed-with-uuid.https.window.js
index 25bde7cecc5..7405a8ee6e3 100644
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptors/gen-characteristic-is-removed-with-uuid.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptors/gen-characteristic-is-removed-with-uuid.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptors/gen-characteristic-is-removed.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptors/gen-characteristic-is-removed.https.window.js
index c3ff9f6a05c..470f7043be3 100644
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptors/gen-characteristic-is-removed.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptors/gen-characteristic-is-removed.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptors/gen-descriptor-get-same-object.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptors/gen-descriptor-get-same-object.https.window.js
index c997d7afda2..1dc58aea155 100644
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptors/gen-descriptor-get-same-object.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptors/gen-descriptor-get-same-object.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptors/gen-service-is-removed-with-uuid.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptors/gen-service-is-removed-with-uuid.https.window.js
index 03bb51239dc..5ee7e0d2494 100644
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptors/gen-service-is-removed-with-uuid.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptors/gen-service-is-removed-with-uuid.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptors/gen-service-is-removed.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptors/gen-service-is-removed.https.window.js
index 762f9cc9955..24a2087e938 100644
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptors/gen-service-is-removed.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/getDescriptors/gen-service-is-removed.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/notifications/characteristic-is-removed.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/notifications/characteristic-is-removed.https.window.js
index 6b5d3e22a12..2ab165d9044 100644
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/notifications/characteristic-is-removed.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/notifications/characteristic-is-removed.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/notifications/service-is-removed.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/notifications/service-is-removed.https.window.js
index 29bc671c5d4..d2456934d83 100644
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/notifications/service-is-removed.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/notifications/service-is-removed.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/add-multiple-event-listeners.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/add-multiple-event-listeners.https.window.js
index 7e6e4159bb1..13709ea941e 100644
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/add-multiple-event-listeners.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/add-multiple-event-listeners.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/characteristic-is-removed.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/characteristic-is-removed.https.window.js
index 07678e6e037..269f2cb4a1f 100644
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/characteristic-is-removed.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/characteristic-is-removed.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/event-is-fired.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/event-is-fired.https.window.js
index eee34d0612d..03b8f2b4cee 100644
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/event-is-fired.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/event-is-fired.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/gen-characteristic-is-removed.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/gen-characteristic-is-removed.https.window.js
index a2de3c39e20..26efe8b306b 100644
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/gen-characteristic-is-removed.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/gen-characteristic-is-removed.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/read-succeeds.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/read-succeeds.https.window.js
index aeece7d11f4..82be128f312 100644
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/read-succeeds.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/read-succeeds.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/read-updates-value.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/read-updates-value.https.window.js
index 45da8af2502..34da455ddff 100644
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/read-updates-value.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/read-updates-value.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/service-is-removed.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/service-is-removed.https.window.js
index 07e9701d3c3..20dd4ba1c05 100644
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/service-is-removed.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/readValue/service-is-removed.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/service-same-from-2-characteristics.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/service-same-from-2-characteristics.https.window.js
index e3bc5d0e103..b34b3b9216a 100644
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/service-same-from-2-characteristics.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/service-same-from-2-characteristics.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/service-same-object.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/service-same-object.https.window.js
index 6b1f543ae5e..b58902ae519 100644
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/service-same-object.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/service-same-object.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/startNotifications/gen-characteristic-is-removed.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/startNotifications/gen-characteristic-is-removed.https.window.js
index 76b2d42a481..af27f933d8f 100644
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/startNotifications/gen-characteristic-is-removed.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/startNotifications/gen-characteristic-is-removed.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/buffer-is-detached.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/buffer-is-detached.https.window.js
index 35347e3bcf8..cefbb6ee8c3 100644
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/buffer-is-detached.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/buffer-is-detached.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/characteristic-is-removed.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/characteristic-is-removed.https.window.js
index 33a963bed09..c0f5a3e6509 100644
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/characteristic-is-removed.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/characteristic-is-removed.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/gen-characteristic-is-removed.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/gen-characteristic-is-removed.https.window.js
index 00c50894e5b..d5ac10fc611 100644
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/gen-characteristic-is-removed.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/gen-characteristic-is-removed.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/service-is-removed.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/service-is-removed.https.window.js
index a9f812c137f..e7a2837c389 100644
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/service-is-removed.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/service-is-removed.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/write-succeeds.https.window.js b/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/write-succeeds.https.window.js
index 1472c619a2d..cdda9cec345 100644
--- a/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/write-succeeds.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/characteristic/writeValue/write-succeeds.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/descriptor/readValue/gen-service-is-removed.https.window.js b/tests/wpt/web-platform-tests/bluetooth/descriptor/readValue/gen-service-is-removed.https.window.js
index 3b6c78a97c5..aa95687094b 100644
--- a/tests/wpt/web-platform-tests/bluetooth/descriptor/readValue/gen-service-is-removed.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/descriptor/readValue/gen-service-is-removed.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/descriptor/readValue/read-succeeds.https.window.js b/tests/wpt/web-platform-tests/bluetooth/descriptor/readValue/read-succeeds.https.window.js
index 5f3c5f8f084..fc1facaf58e 100644
--- a/tests/wpt/web-platform-tests/bluetooth/descriptor/readValue/read-succeeds.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/descriptor/readValue/read-succeeds.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/descriptor/writeValue/buffer-is-detached.https.window.js b/tests/wpt/web-platform-tests/bluetooth/descriptor/writeValue/buffer-is-detached.https.window.js
index 23ea2329a64..2ff277ec949 100644
--- a/tests/wpt/web-platform-tests/bluetooth/descriptor/writeValue/buffer-is-detached.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/descriptor/writeValue/buffer-is-detached.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/descriptor/writeValue/gen-service-is-removed.https.window.js b/tests/wpt/web-platform-tests/bluetooth/descriptor/writeValue/gen-service-is-removed.https.window.js
index ca75ebaba88..a486819b55a 100644
--- a/tests/wpt/web-platform-tests/bluetooth/descriptor/writeValue/gen-service-is-removed.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/descriptor/writeValue/gen-service-is-removed.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/device/gattserverdisconnected-event/disconnected.https.window.js b/tests/wpt/web-platform-tests/bluetooth/device/gattserverdisconnected-event/disconnected.https.window.js
index 245e43d3150..dab54d5da29 100644
--- a/tests/wpt/web-platform-tests/bluetooth/device/gattserverdisconnected-event/disconnected.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/device/gattserverdisconnected-event/disconnected.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/device/gattserverdisconnected-event/disconnected_gc.https.window.js b/tests/wpt/web-platform-tests/bluetooth/device/gattserverdisconnected-event/disconnected_gc.https.window.js
index 69e30443ee6..a15cc943f4e 100644
--- a/tests/wpt/web-platform-tests/bluetooth/device/gattserverdisconnected-event/disconnected_gc.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/device/gattserverdisconnected-event/disconnected_gc.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/device/gattserverdisconnected-event/one-event-per-disconnection.https.window.js b/tests/wpt/web-platform-tests/bluetooth/device/gattserverdisconnected-event/one-event-per-disconnection.https.window.js
index 317eddee9ba..f5e45f99755 100644
--- a/tests/wpt/web-platform-tests/bluetooth/device/gattserverdisconnected-event/one-event-per-disconnection.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/device/gattserverdisconnected-event/one-event-per-disconnection.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/device/gattserverdisconnected-event/reconnect-during-disconnected-event.https.window.js b/tests/wpt/web-platform-tests/bluetooth/device/gattserverdisconnected-event/reconnect-during-disconnected-event.https.window.js
index 93a46eeb934..8f264c7b025 100644
--- a/tests/wpt/web-platform-tests/bluetooth/device/gattserverdisconnected-event/reconnect-during-disconnected-event.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/device/gattserverdisconnected-event/reconnect-during-disconnected-event.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/script-tests/base_test_js.template b/tests/wpt/web-platform-tests/bluetooth/script-tests/base_test_js.template
index 56971d2c6c9..c0fa4aed552 100644
--- a/tests/wpt/web-platform-tests/bluetooth/script-tests/base_test_js.template
+++ b/tests/wpt/web-platform-tests/bluetooth/script-tests/base_test_js.template
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-disconnect-called-before.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-disconnect-called-before.https.window.js
index 2d94b41e020..1eb62d3a311 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-disconnect-called-before.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-disconnect-called-before.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-disconnect-called-during-error.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-disconnect-called-during-error.https.window.js
index 0d6e8a7a179..c7c80244193 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-disconnect-called-during-error.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-disconnect-called-during-error.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-disconnect-called-during-success.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-disconnect-called-during-success.https.window.js
index 18af59d7f80..5655d8ee41c 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-disconnect-called-during-success.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-disconnect-called-during-success.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-disconnect-invalidates-objects.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-disconnect-invalidates-objects.https.window.js
index 5cfe893f5d8..c95f8b921a7 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-disconnect-invalidates-objects.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-disconnect-invalidates-objects.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-disconnected-device.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-disconnected-device.https.window.js
index 622f2cf3212..e610b715b3a 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-disconnected-device.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-disconnected-device.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-discovery-complete-no-permission-absent-service.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-discovery-complete-no-permission-absent-service.https.window.js
index 5afb0262658..ee3cf97f4db 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-discovery-complete-no-permission-absent-service.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-discovery-complete-no-permission-absent-service.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-discovery-complete-service-not-found.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-discovery-complete-service-not-found.https.window.js
index 86fa5e9b011..5bf720cd48e 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-discovery-complete-service-not-found.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-discovery-complete-service-not-found.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-garbage-collection-ran-during-error.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-garbage-collection-ran-during-error.https.window.js
index 2c35c1b7556..4c3111720c2 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-garbage-collection-ran-during-error.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-garbage-collection-ran-during-error.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-garbage-collection-ran-during-success.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-garbage-collection-ran-during-success.https.window.js
index cca8c2c5d2f..fe7d749063d 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-garbage-collection-ran-during-success.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-garbage-collection-ran-during-success.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-get-different-service-after-reconnection.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-get-different-service-after-reconnection.https.window.js
index a0f073d8a31..301658c73bb 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-get-different-service-after-reconnection.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-get-different-service-after-reconnection.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-get-same-object.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-get-same-object.https.window.js
index 3deb387406e..c46a1a52c03 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-get-same-object.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-get-same-object.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-invalid-service-name.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-invalid-service-name.https.window.js
index d59e202d71c..704ab8bb2da 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-invalid-service-name.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-invalid-service-name.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-no-permission-absent-service.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-no-permission-absent-service.https.window.js
index 89ca4688447..8daab29eaf9 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-no-permission-absent-service.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-no-permission-absent-service.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-no-permission-for-any-service.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-no-permission-for-any-service.https.window.js
index fec0055dcdb..d55dee753cf 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-no-permission-for-any-service.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-no-permission-for-any-service.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-no-permission-present-service.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-no-permission-present-service.https.window.js
index a0161a0446b..d357a214dfd 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-no-permission-present-service.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-no-permission-present-service.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-service-not-found.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-service-not-found.https.window.js
index 60fb4f2c529..32350e779dc 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-service-not-found.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryService/gen-service-not-found.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-before-with-uuid.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-before-with-uuid.https.window.js
index 86a346d1483..ad446499cba 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-before-with-uuid.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-before-with-uuid.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-before.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-before.https.window.js
index 97e9f77d12e..485dbb30421 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-before.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-before.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-error-with-uuid.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-error-with-uuid.https.window.js
index 37394075d80..230325a8c76 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-error-with-uuid.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-error-with-uuid.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-error.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-error.https.window.js
index 9c7aac67a4a..dce13c5d006 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-error.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-error.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-success-with-uuid.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-success-with-uuid.https.window.js
index bffcea4e9fb..8e2e32ba4fd 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-success-with-uuid.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-success-with-uuid.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-success.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-success.https.window.js
index 162a61f3eb5..78dcffdcbb1 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-success.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-called-during-success.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-invalidates-objects-with-uuid.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-invalidates-objects-with-uuid.https.window.js
index 05dce42424d..d9f61674671 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-invalidates-objects-with-uuid.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-invalidates-objects-with-uuid.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-invalidates-objects.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-invalidates-objects.https.window.js
index e17162a7198..b1c9688cc14 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-invalidates-objects.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnect-invalidates-objects.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnected-device-with-uuid.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnected-device-with-uuid.https.window.js
index 3bfa60d8ccb..8d64dafb760 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnected-device-with-uuid.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnected-device-with-uuid.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnected-device.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnected-device.https.window.js
index 7072b3efb1f..9c411120a04 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnected-device.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-disconnected-device.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-discovery-complete-no-permission-absent-service-with-uuid.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-discovery-complete-no-permission-absent-service-with-uuid.https.window.js
index 589ebe38644..130657d228f 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-discovery-complete-no-permission-absent-service-with-uuid.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-discovery-complete-no-permission-absent-service-with-uuid.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-discovery-complete-service-not-found-with-uuid.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-discovery-complete-service-not-found-with-uuid.https.window.js
index 15b8b978040..3817a1a5a38 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-discovery-complete-service-not-found-with-uuid.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-discovery-complete-service-not-found-with-uuid.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-error-with-uuid.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-error-with-uuid.https.window.js
index 17495d24eba..c986835ce31 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-error-with-uuid.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-error-with-uuid.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-error.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-error.https.window.js
index 741cd2171f8..bd438db09e3 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-error.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-error.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-success-with-uuid.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-success-with-uuid.https.window.js
index 1ee4f21ccba..3b441cedeff 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-success-with-uuid.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-success-with-uuid.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-success.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-success.https.window.js
index 285b774c4e7..1b3302a1ba6 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-success.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-garbage-collection-ran-during-success.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-get-different-service-after-reconnection-with-uuid.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-get-different-service-after-reconnection-with-uuid.https.window.js
index eb20e6f4b2f..378ade0c90b 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-get-different-service-after-reconnection-with-uuid.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-get-different-service-after-reconnection-with-uuid.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-get-different-service-after-reconnection.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-get-different-service-after-reconnection.https.window.js
index 14fc656c70d..bdef5aa2f20 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-get-different-service-after-reconnection.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-get-different-service-after-reconnection.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-get-same-object-with-uuid.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-get-same-object-with-uuid.https.window.js
index f3fc4906b44..aca34e58ff0 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-get-same-object-with-uuid.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-get-same-object-with-uuid.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-get-same-object.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-get-same-object.https.window.js
index c7c488a18b9..0ea805e339d 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-get-same-object.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-get-same-object.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-invalid-service-name.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-invalid-service-name.https.window.js
index 025f1ccdf7c..eeb6dd4dcf8 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-invalid-service-name.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-invalid-service-name.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-no-permission-absent-service-with-uuid.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-no-permission-absent-service-with-uuid.https.window.js
index 6f1bb251723..c755dd7129d 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-no-permission-absent-service-with-uuid.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-no-permission-absent-service-with-uuid.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-no-permission-for-any-service-with-uuid.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-no-permission-for-any-service-with-uuid.https.window.js
index 4bbddeae56e..03b7f2329c8 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-no-permission-for-any-service-with-uuid.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-no-permission-for-any-service-with-uuid.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-no-permission-for-any-service.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-no-permission-for-any-service.https.window.js
index 40b8b576ff4..e50c6d56128 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-no-permission-for-any-service.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-no-permission-for-any-service.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-no-permission-present-service-with-uuid.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-no-permission-present-service-with-uuid.https.window.js
index 6f737ecf889..c703d0a9363 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-no-permission-present-service-with-uuid.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-no-permission-present-service-with-uuid.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-service-not-found-with-uuid.https.window.js b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-service-not-found-with-uuid.https.window.js
index 33946d281bd..9dc1877f9f2 100644
--- a/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-service-not-found-with-uuid.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/server/getPrimaryServices/gen-service-not-found-with-uuid.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-blocklisted-characteristic.https.window.js b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-blocklisted-characteristic.https.window.js
index 04176f1ecda..72b9bac63a4 100644
--- a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-blocklisted-characteristic.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-blocklisted-characteristic.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-characteristic-not-found.https.window.js b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-characteristic-not-found.https.window.js
index cfec509c492..a8b2ef892c7 100644
--- a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-characteristic-not-found.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-characteristic-not-found.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-garbage-collection-ran-during-error.https.window.js b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-garbage-collection-ran-during-error.https.window.js
index 9543a5e5633..7457161faa0 100644
--- a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-garbage-collection-ran-during-error.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-garbage-collection-ran-during-error.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-get-same-object.https.window.js b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-get-same-object.https.window.js
index 73691befa52..54ab061deb9 100644
--- a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-get-same-object.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-get-same-object.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-invalid-characteristic-name.https.window.js b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-invalid-characteristic-name.https.window.js
index d21dcf56122..8f44ecb08be 100644
--- a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-invalid-characteristic-name.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-invalid-characteristic-name.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-reconnect-during.https.window.js b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-reconnect-during.https.window.js
index 6f862142464..da5462a8bfa 100644
--- a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-reconnect-during.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-reconnect-during.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-service-is-removed.https.window.js b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-service-is-removed.https.window.js
index b6d6a9df96e..0fe5b01146e 100644
--- a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-service-is-removed.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristic/gen-service-is-removed.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-blocklisted-characteristic-with-uuid.https.window.js b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-blocklisted-characteristic-with-uuid.https.window.js
index 3afd294d5b1..cd8a6fa380a 100644
--- a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-blocklisted-characteristic-with-uuid.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-blocklisted-characteristic-with-uuid.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-characteristic-not-found-with-uuid.https.window.js b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-characteristic-not-found-with-uuid.https.window.js
index 549f6b26719..fff2bd038a8 100644
--- a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-characteristic-not-found-with-uuid.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-characteristic-not-found-with-uuid.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-garbage-collection-ran-during-error-with-uuid.https.window.js b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-garbage-collection-ran-during-error-with-uuid.https.window.js
index 643e2f839ef..925786c74de 100644
--- a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-garbage-collection-ran-during-error-with-uuid.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-garbage-collection-ran-during-error-with-uuid.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-garbage-collection-ran-during-error.https.window.js b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-garbage-collection-ran-during-error.https.window.js
index b7db67f613f..d0ecff89f70 100644
--- a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-garbage-collection-ran-during-error.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-garbage-collection-ran-during-error.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-get-same-object-with-uuid.https.window.js b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-get-same-object-with-uuid.https.window.js
index 15b552af491..fb3346dc4e4 100644
--- a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-get-same-object-with-uuid.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-get-same-object-with-uuid.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-get-same-object.https.window.js b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-get-same-object.https.window.js
index df30d514f39..576e0831501 100644
--- a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-get-same-object.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-get-same-object.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-invalid-characteristic-name.https.window.js b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-invalid-characteristic-name.https.window.js
index f980ac03d5f..5b2bd39d3e0 100644
--- a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-invalid-characteristic-name.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-invalid-characteristic-name.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-reconnect-during-with-uuid.https.window.js b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-reconnect-during-with-uuid.https.window.js
index eb4233764aa..95f22b11fcf 100644
--- a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-reconnect-during-with-uuid.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-reconnect-during-with-uuid.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-reconnect-during.https.window.js b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-reconnect-during.https.window.js
index a6d38805973..184632f1d05 100644
--- a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-reconnect-during.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-reconnect-during.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-service-is-removed-with-uuid.https.window.js b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-service-is-removed-with-uuid.https.window.js
index 527eb765276..6ff7b4f3631 100644
--- a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-service-is-removed-with-uuid.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-service-is-removed-with-uuid.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-service-is-removed.https.window.js b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-service-is-removed.https.window.js
index 466503241ed..b4492885b83 100644
--- a/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-service-is-removed.https.window.js
+++ b/tests/wpt/web-platform-tests/bluetooth/service/getCharacteristics/gen-service-is-removed.https.window.js
@@ -1,5 +1,3 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=/bluetooth/resources/bluetooth-helpers.js
diff --git a/tests/wpt/web-platform-tests/common/security-features/README.md b/tests/wpt/web-platform-tests/common/security-features/README.md
index a2ae9aa8e16..deac1ccd895 100644
--- a/tests/wpt/web-platform-tests/common/security-features/README.md
+++ b/tests/wpt/web-platform-tests/common/security-features/README.md
@@ -11,3 +11,96 @@ Subdirectories:
 - `scope`:
     Serves nested contexts, such as iframe documents or workers.
     Used from `invokeFrom*()` functions in `resources/common.js`.
+
+# spec.src.json format
+
+## Source Contexts
+
+In **`source_context_list_schema`**, we can specify
+
+- source contexts from where subresource requests are sent, and
+- how policies are delivered, by source contexts and/or subresource requests.
+
+- `sourceContextList`: an array of `SourceContext` objects, and
+- `subresourcePolicyDeliveries`: an array of `PolicyDelivery` objects.
+
+They have the same object format as described in
+`common/security-features/resources/common.js` comments, and are directly
+serialized to generated HTML files and passed to JavaScript test code,
+except that:
+
+- The first entry of `sourceContextList`'s `sourceContextType` should be
+  always `top`, which represents the top-level generated test HTML.
+  (This entry is omitted in the JSON passed to JavaScript, but
+  the policy deliveries specified here are written as e.g.
+  <meta> elements in the generated test HTML or HTTP headers)
+- Instead of `PolicyDelivery` object (in `sourceContextList` or
+  `subresourcePolicyDeliveries`), following placeholder strings can be used.
+
+The keys of `source_context_list_schema` can be used as the values of
+`source_context_list` fields, to indicate which source context configuration
+to be used.
+
+## PolicyDelivery placeholders
+
+Each test contains
+
+- `delivery_key` (derived from the top-level `delivery_key`) and
+- `delivery_value`, `delivery_type` (derived from `test_expansion`),
+
+which represents the **target policy delivery**, the policy delivery to be
+tested.
+
+The following placeholder strings in `source_context_list_schema` can be used:
+
+- `"policy"`:
+    - Replaced with the target policy delivery.
+    - Can be used to specify where the target policy delivery should be
+      delivered.
+- `"policyIfNonNull"`:
+    - Replaced with the target policy delivery, only if it has non-null value.
+      If the value is null, then the test file is not generated.
+- `"anotherPolicy"`:
+    - Replaced with a `PolicyDelivery` object that has a different value from
+      the target policy delivery.
+    - Can be used to specify e.g. a policy that should be overridden by
+      the target policy delivery.
+
+For example, when the target policy delivery is
+{deliveryType: "http-rp", key: "referrerPolicy", value: "no-referrer"},
+
+    "sourceContextList": [
+      {"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]},
+      {"sourceContextType": "classic-worker", "policyDeliveries": ["policy"]}
+    ]
+
+is replaced with
+
+    "sourceContextList": [
+      {"sourceContextType": "top", "policyDeliveries": [
+          {"deliveryType": "meta",
+           "key": "referrerPolicy",
+           "value": "unsafe-url"}]
+      },
+      {"sourceContextType": "classic-worker", "policyDeliveries": [
+          {"deliveryType": "http-rp",
+           "key": "referrerPolicy",
+           "value": "no-referrer"}]
+      }
+    ]
+
+which indicates
+
+- The top-level Document has `<meta name="referrer" content="unsafe-url">`.
+- The classic worker is created with
+  `Referrer-Policy: no-referrer` HTTP response headers.
+
+## `source_context_schema` and `subresource_schema`
+
+These represent supported delivery types and subresources
+for each source context or subresource type. These are used
+
+- To filter out test files for unsupported combinations of delivery types,
+  source contexts and subresources.
+- To determine what delivery types should be used for `anotherPolicy`
+  placeholder.
diff --git a/tests/wpt/web-platform-tests/common/security-features/resources/common.js b/tests/wpt/web-platform-tests/common/security-features/resources/common.js
index 7afa6068bf4..6986f841a88 100644
--- a/tests/wpt/web-platform-tests/common/security-features/resources/common.js
+++ b/tests/wpt/web-platform-tests/common/security-features/resources/common.js
@@ -100,7 +100,7 @@
   from the outer-most to inner-most environment settings objects.
 
   For example:
-    [{sourceContextType: "srcdoc"}, {sourceContextType: "classic-worker"}]
+    [{sourceContextType: "srcdoc"}, {sourceContextType: "worker-classic"}]
   means that a subresource request is to be sent from
   a classic dedicated worker created from <iframe srcdoc>
   inside the top-level HTML document.
@@ -1059,19 +1059,19 @@ function invokeRequest(subresource, sourceContextList) {
     "iframe": { // <iframe src="same-origin-URL"></iframe>
       invoker: invokeFromIframe,
     },
-    "classic-worker": {
+    "worker-classic": {
       // Classic dedicated worker loaded from same-origin.
       invoker: invokeFromWorker.bind(undefined, false, {}),
     },
-    "classic-data-worker": {
+    "worker-classic-data": {
       // Classic dedicated worker loaded from data: URL.
       invoker: invokeFromWorker.bind(undefined, true, {}),
     },
-    "module-worker": {
+    "worker-module": {
       // Module dedicated worker loaded from same-origin.
       invoker: invokeFromWorker.bind(undefined, false, {type: 'module'}),
     },
-    "module-data-worker": {
+    "worker-module-data": {
       // Module dedicated worker loaded from data: URL.
       invoker: invokeFromWorker.bind(undefined, true, {type: 'module'}),
     },
diff --git a/tests/wpt/web-platform-tests/common/security-features/tools/generate.py b/tests/wpt/web-platform-tests/common/security-features/tools/generate.py
index 0b18a391a62..0cf7fab42ec 100644
--- a/tests/wpt/web-platform-tests/common/security-features/tools/generate.py
+++ b/tests/wpt/web-platform-tests/common/security-features/tools/generate.py
@@ -1,9 +1,12 @@
 from __future__ import print_function
 
+import argparse
 import copy
-import os, sys, json
+import json
+import os
+import sys
+
 import spec_validator
-import argparse
 import util
 
 
@@ -54,7 +57,11 @@ def dump_test_parameters(selection):
     del selection['name']
 
     return json.dumps(
-        selection, indent=2, separators=(',', ': '), sort_keys=True)
+        selection,
+        indent=2,
+        separators=(',', ': '),
+        sort_keys=True,
+        cls=util.CustomEncoder)
 
 
 def get_test_filename(config, selection):
@@ -108,7 +115,48 @@ def handle_deliveries(policy_deliveries):
     return {"meta": meta, "headers": headers}
 
 
-def generate_selection(config, selection, spec, test_html_template_basename):
+def generate_selection(spec_json, config, selection, spec,
+                       test_html_template_basename):
+    test_filename = get_test_filename(config, selection)
+
+    target_policy_delivery = util.PolicyDelivery(selection['delivery_type'],
+                                                 selection['delivery_key'],
+                                                 selection['delivery_value'])
+    del selection['delivery_type']
+    del selection['delivery_key']
+    del selection['delivery_value']
+
+    # Parse source context list and policy deliveries of source contexts.
+    # `util.ShouldSkip()` exceptions are raised if e.g. unsuppported
+    # combinations of source contexts and policy deliveries are used.
+    source_context_list_scheme = spec_json['source_context_list_schema'][
+        selection['source_context_list']]
+    selection['source_context_list'] = [
+        util.SourceContext.from_json(source_context, target_policy_delivery,
+                                     spec_json['source_context_schema'])
+        for source_context in source_context_list_scheme['sourceContextList']
+    ]
+
+    # Check if the subresource is supported by the innermost source context.
+    innermost_source_context = selection['source_context_list'][-1]
+    supported_subresource = spec_json['source_context_schema'][
+        'supported_subresource'][innermost_source_context.source_context_type]
+    if supported_subresource != '*':
+        if selection['subresource'] not in supported_subresource:
+            raise util.ShouldSkip()
+
+    # Parse subresource policy deliveries.
+    selection[
+        'subresource_policy_deliveries'] = util.PolicyDelivery.list_from_json(
+            source_context_list_scheme['subresourcePolicyDeliveries'],
+            target_policy_delivery, spec_json['subresource_schema']
+            ['supported_delivery_type'][selection['subresource']])
+
+    # We process the top source context below, and do not include it in
+    # `test_parameters` in JavaScript.
+    top_source_context = selection['source_context_list'].pop(0)
+    assert (top_source_context.source_context_type == 'top')
+
     test_parameters = dump_test_parameters(selection)
     # Adjust the template for the test invoking JS. Indent it to look nice.
     indent = "\n" + " " * 8
@@ -131,7 +179,6 @@ def generate_selection(config, selection, spec, test_html_template_basename):
     selection['sanity_checker_js'] = config.sanity_checker_js
     selection['spec_json_js'] = config.spec_json_js
 
-    test_filename = get_test_filename(config, selection)
     test_headers_filename = test_filename + ".headers"
     test_directory = os.path.dirname(test_filename)
 
@@ -159,11 +206,7 @@ def generate_selection(config, selection, spec, test_html_template_basename):
     except:
         pass
 
-    delivery = handle_deliveries([
-        util.PolicyDelivery(selection['delivery_type'],
-                            selection['delivery_key'],
-                            selection['delivery_value'])
-    ])
+    delivery = handle_deliveries(top_source_context.policy_deliveries)
 
     if len(delivery['headers']) > 0:
         with open(test_headers_filename, "w") as f:
@@ -232,7 +275,11 @@ def generate_test_source_files(config, spec_json, target):
 
         for selection_path in output_dict:
             selection = output_dict[selection_path]
-            generate_selection(config, selection, spec, html_template)
+            try:
+                generate_selection(spec_json, config, selection, spec,
+                                   html_template)
+            except util.ShouldSkip:
+                continue
 
 
 def main(config):
diff --git a/tests/wpt/web-platform-tests/common/security-features/tools/spec_validator.py b/tests/wpt/web-platform-tests/common/security-features/tools/spec_validator.py
index 2c966478869..fff4c5dd6f6 100755
--- a/tests/wpt/web-platform-tests/common/security-features/tools/spec_validator.py
+++ b/tests/wpt/web-platform-tests/common/security-features/tools/spec_validator.py
@@ -57,6 +57,15 @@ def assert_contains_only_fields(obj, expected_fields):
                 'Unexpected field "%s".' % actual_field
 
 
+def leaf_values(schema):
+    if isinstance(schema, list):
+        return schema
+    ret = []
+    for _, sub_schema in schema.iteritems():
+        ret += leaf_values(sub_schema)
+    return ret
+
+
 def assert_value_unique_in(value, used_values):
     assert value not in used_values, 'Duplicate value "%s"!' % str(value)
     used_values[value] = True
@@ -78,8 +87,9 @@ def validate(spec_json, details):
 
     details['object'] = spec_json
     assert_contains_only_fields(spec_json, [
-        "specification", "delivery_key", "test_expansion_schema",
-        "excluded_tests"
+        "specification", "delivery_key", "subresource_schema",
+        "source_context_schema", "source_context_list_schema",
+        "test_expansion_schema", "excluded_tests"
     ])
     assert_non_empty_list(spec_json, "specification")
     assert_non_empty_dict(spec_json, "test_expansion_schema")
@@ -91,6 +101,29 @@ def validate(spec_json, details):
 
     valid_test_expansion_fields = ['name'] + test_expansion_schema.keys()
 
+    valid_source_context_names = [
+        "top", "iframe", "srcdoc", "worker-classic", "worker-module",
+        "worker-classic-data", "worker-module-data"
+    ]
+
+    valid_subresource_names = [
+        "a-tag", "area-tag", "audio-tag", "form-tag", "iframe-tag", "img-tag",
+        "link-css-tag", "link-prefetch-tag", "object-tag", "picture-tag",
+        "script-tag", "video-tag"
+    ] + ["beacon", "fetch", "xhr", "websocket"] + [
+        "worker-classic", "worker-module", "worker-import",
+        "worker-import-data", "sharedworker-classic", "sharedworker-module",
+        "sharedworker-import", "sharedworker-import-data",
+        "serviceworker-classic", "serviceworker-module",
+        "serviceworker-import", "serviceworker-import-data"
+    ] + [
+        "worklet-animation", "worklet-audio", "worklet-layout",
+        "worklet-paint", "worklet-animation-import", "worklet-audio-import",
+        "worklet-layout-import", "worklet-paint-import",
+        "worklet-animation-import-data", "worklet-audio-import-data",
+        "worklet-layout-import-data", "worklet-paint-import-data"
+    ]
+
     # Validate each single spec.
     for spec in specification:
         details['object'] = spec
@@ -123,12 +156,66 @@ def validate(spec_json, details):
                                       test_expansion_schema[artifact])
                 del details['test_expansion_field']
 
+    # Validate source_context_schema.
+    details['object'] = spec_json['source_context_schema']
+    assert_contains_only_fields(
+        spec_json['source_context_schema'],
+        ['supported_delivery_type', 'supported_subresource'])
+    assert_contains_only_fields(
+        spec_json['source_context_schema']['supported_delivery_type'],
+        valid_source_context_names)
+    for source_context in spec_json['source_context_schema'][
+            'supported_delivery_type']:
+        assert_valid_artifact(
+            spec_json['source_context_schema']['supported_delivery_type'],
+            source_context, test_expansion_schema['delivery_type'])
+    assert_contains_only_fields(
+        spec_json['source_context_schema']['supported_subresource'],
+        valid_source_context_names)
+    for source_context in spec_json['source_context_schema'][
+            'supported_subresource']:
+        assert_valid_artifact(
+            spec_json['source_context_schema']['supported_subresource'],
+            source_context, leaf_values(test_expansion_schema['subresource']))
+
+    # Validate subresource_schema.
+    details['object'] = spec_json['subresource_schema']
+    assert_contains_only_fields(spec_json['subresource_schema'],
+                                ['supported_delivery_type'])
+    assert_contains_only_fields(
+        spec_json['subresource_schema']['supported_delivery_type'],
+        leaf_values(test_expansion_schema['subresource']))
+    for subresource in spec_json['subresource_schema'][
+            'supported_delivery_type']:
+        assert_valid_artifact(
+            spec_json['subresource_schema']['supported_delivery_type'],
+            subresource, test_expansion_schema['delivery_type'])
+
     # Validate the test_expansion schema members.
     details['object'] = test_expansion_schema
     assert_contains_only_fields(test_expansion_schema, [
-        'expansion', 'source_scheme', 'delivery_type', 'delivery_value',
-        'redirection', 'subresource', 'origin', 'expectation'
+        'expansion', 'source_scheme', 'source_context_list', 'delivery_type',
+        'delivery_value', 'redirection', 'subresource', 'origin', 'expectation'
+    ])
+    assert_atom_or_list_items_from(test_expansion_schema, 'expansion',
+                                   ['default', 'override'])
+    assert_atom_or_list_items_from(test_expansion_schema, 'source_scheme',
+                                   ['http', 'https'])
+    assert_atom_or_list_items_from(
+        test_expansion_schema, 'source_context_list',
+        spec_json['source_context_list_schema'].keys())
+
+    assert_atom_or_list_items_from(test_expansion_schema, 'redirection', [
+        'no-redirect', 'keep-origin', 'swap-origin', 'keep-scheme',
+        'swap-scheme'
     ])
+    for subresource in leaf_values(test_expansion_schema['subresource']):
+        assert subresource in valid_subresource_names, "Invalid subresource %s" % subresource
+    assert_atom_or_list_items_from(test_expansion_schema, 'origin', [
+        'same-http', 'same-https', 'same-ws', 'same-wss', 'cross-http',
+        'cross-https', 'cross-ws', 'cross-wss'
+    ])
+
     # Validate excluded tests.
     details['object'] = excluded_tests
     for excluded_test_expansion in excluded_tests:
diff --git a/tests/wpt/web-platform-tests/common/security-features/tools/util.py b/tests/wpt/web-platform-tests/common/security-features/tools/util.py
index fc8d3b30ef7..57e95fea078 100644
--- a/tests/wpt/web-platform-tests/common/security-features/tools/util.py
+++ b/tests/wpt/web-platform-tests/common/security-features/tools/util.py
@@ -41,6 +41,21 @@ def load_spec_json(path_to_spec):
             sys.exit(1)
 
 
+class ShouldSkip(Exception):
+    '''
+    Raised when the given combination of subresource type, source context type,
+    delivery type etc. are not supported and we should skip that configuration.
+    ShouldSkip is expected in normal generator execution (and thus subsequent
+    generation continues), as we first enumerate a broad range of configurations
+    first, and later raise ShouldSkip to filter out unsupported combinations.
+
+    ShouldSkip is distinguished from other general errors that cause immediate
+    termination of the generator and require fix.
+    '''
+    def __init__(self):
+        pass
+
+
 class PolicyDelivery(object):
     '''
     See `@typedef PolicyDelivery` comments in `resources/common.js`.
@@ -50,3 +65,129 @@ class PolicyDelivery(object):
         self.delivery_type = delivery_type
         self.key = key
         self.value = value
+
+    @classmethod
+    def list_from_json(cls, list, target_policy_delivery,
+                       supported_delivery_types):
+        # type: (dict, PolicyDelivery, typing.List[str]) -> typing.List[PolicyDelivery]
+        '''
+        Parses a JSON object `list` that represents a list of `PolicyDelivery`
+        and returns a list of `PolicyDelivery`, plus supporting placeholders
+        (see `from_json()` comments below or
+        `common/security-features/README.md`).
+
+        Can raise `ShouldSkip`.
+        '''
+        if list is None:
+            return []
+
+        out = []
+        for obj in list:
+            policy_delivery = PolicyDelivery.from_json(
+                obj, target_policy_delivery, supported_delivery_types)
+            # Drop entries with null values.
+            if policy_delivery.value is None:
+                continue
+            out.append(policy_delivery)
+        return out
+
+    @classmethod
+    def from_json(cls, obj, target_policy_delivery, supported_delivery_types):
+        # type: (dict, PolicyDelivery, typing.List[str]) -> PolicyDelivery
+        '''
+           Parses a JSON object `obj` and returns a `PolicyDelivery` object.
+           In addition to dicts (in the same format as to_json() outputs),
+           this method accepts the following placeholders:
+             "policy":
+               `target_policy_delivery`
+             "policyIfNonNull":
+               `target_policy_delivery` if its value is not None.
+             "anotherPolicy":
+               A PolicyDelivery that has the same key as
+               `target_policy_delivery` but a different value.
+               The delivery type is selected from `supported_delivery_types`.
+
+        Can raise `ShouldSkip`.
+        '''
+
+        if obj == "policy":
+            policy_delivery = target_policy_delivery
+        elif obj == "nonNullPolicy":
+            if target_policy_delivery.value is None:
+                raise ShouldSkip()
+            policy_delivery = target_policy_delivery
+        elif obj == "anotherPolicy":
+            policy_delivery = target_policy_delivery.get_another_policy(
+                supported_delivery_types[0])
+        elif type(obj) == dict:
+            policy_delivery = PolicyDelivery(obj['deliveryType'], obj['key'],
+                                             obj['value'])
+        else:
+            raise Exception('policy delivery is invalid: ' + obj)
+
+        # Omit unsupported combinations of source contexts and delivery type.
+        if policy_delivery.delivery_type not in supported_delivery_types:
+            raise ShouldSkip()
+
+        return policy_delivery
+
+    def to_json(self):
+        # type: () -> dict
+        return {
+            "deliveryType": self.delivery_type,
+            "key": self.key,
+            "value": self.value
+        }
+
+    def get_another_policy(self, delivery_type):
+        # type: (str) -> PolicyDelivery
+        if self.key == 'referrerPolicy':
+            if self.value == 'no-referrer':
+                return PolicyDelivery(delivery_type, self.key, 'unsafe-url')
+            else:
+                return PolicyDelivery(delivery_type, self.key, 'no-referrer')
+        else:
+            raise Exception('delivery key is invalid: ' + self.key)
+
+
+class SourceContext(object):
+    def __init__(self, source_context_type, policy_deliveries):
+        # type: (unicode, typing.List[PolicyDelivery]) -> None
+        self.source_context_type = source_context_type
+        self.policy_deliveries = policy_deliveries
+
+    @classmethod
+    def from_json(cls, obj, target_policy_delivery, source_context_schema):
+        '''
+        Parses a JSON object `obj` and returns a `SourceContext` object.
+
+        `target_policy_delivery` and `source_context_schema` are used for
+        policy delivery placeholders and filtering out unsupported
+        delivery types.
+
+        Can raise `ShouldSkip`.
+        '''
+        source_context_type = obj.get('sourceContextType')
+        policy_deliveries = PolicyDelivery.list_from_json(
+            obj.get('policyDeliveries'), target_policy_delivery,
+            source_context_schema['supported_delivery_type']
+            [source_context_type])
+        return SourceContext(source_context_type, policy_deliveries)
+
+    def to_json(self):
+        return {
+            "sourceContextType": self.source_context_type,
+            "policyDeliveries": [x.to_json() for x in self.policy_deliveries]
+        }
+
+
+class CustomEncoder(json.JSONEncoder):
+    '''
+    Used to dump dicts containing `SourceContext`/`PolicyDelivery` into JSON.
+    '''
+    def default(self, obj):
+        if isinstance(obj, SourceContext):
+            return obj.to_json()
+        if isinstance(obj, PolicyDelivery):
+            return obj.to_json()
+        return json.JSONEncoder.default(self, obj)
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-004-ref.html b/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-004-ref.html
index eba5e8cb9a8..56ca5d2e50e 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-004-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-004-ref.html
@@ -15,9 +15,9 @@
 <div>abc</div>
 <video></video><br>
 <video controls></video><br>
-<img src="../support/60x60-green.png"><br>
+<img src="support/60x60-green.png"><br>
 <picture>
-<source srcset="../support/60x60-green.png">
+<source srcset="support/60x60-green.png">
     <img>
 </picture><br>
 <canvas></canvas><br>
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-004.html b/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-004.html
index 511edadc4f8..9f844815046 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-004.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-004.html
@@ -18,9 +18,9 @@
 <div>abc</div>
 <video></video><br>
 <video controls></video><br>
-<img src="../support/60x60-green.png"><br>
+<img src="support/60x60-green.png"><br>
 <picture>
-<source srcset="../support/60x60-green.png">
+<source srcset="support/60x60-green.png">
     <img>
 </picture><br>
 <canvas></canvas><br>
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-005-ref.html b/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-005-ref.html
index a5328c79ac6..178e137cb72 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-005-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-005-ref.html
@@ -16,9 +16,9 @@
 <div>abc</div>
 <video></video><br>
 <video controls></video><br>
-<img src="../support/60x60-green.png"><br>
+<img src="support/60x60-green.png"><br>
 <picture>
-<source srcset="../support/60x60-green.png">
+<source srcset="support/60x60-green.png">
     <img>
 </picture><br>
 <canvas></canvas><br>
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-005.html b/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-005.html
index e889dcc903c..754f3608e3a 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-005.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-005.html
@@ -19,9 +19,9 @@
 <div>abc</div>
 <video></video><br>
 <video controls></video><br>
-<img src="../support/60x60-green.png"><br>
+<img src="support/60x60-green.png"><br>
 <picture>
-<source srcset="../support/60x60-green.png">
+<source srcset="support/60x60-green.png">
     <img>
 </picture><br>
 <canvas></canvas><br>
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-006-ref.html b/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-006-ref.html
index 2f638d7fe42..d6753c0694b 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-006-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-006-ref.html
@@ -2,9 +2,8 @@
 <meta charset="utf-8">
 <title>CSS Containment Reference: Size containment replaced elements intrinsic size</title>
 <style>
-  body > div, video, audio, img, canvas, svg, iframe {
+  div, video, audio, img, canvas, svg, iframe {
     border: 3px solid orange;
-    contain: size;
     margin-bottom: 15px;
     width: 25px;
     height: 35px;
@@ -15,9 +14,9 @@
 <div>abc</div>
 <video></video><br>
 <video controls></video><br>
-<img src="../support/60x60-green.png"><br>
+<img src="support/60x60-green.png"><br>
 <picture>
-<source srcset="../support/60x60-green.png">
+<source srcset="support/60x60-green.png">
     <img>
 </picture><br>
 <canvas></canvas><br>
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-006.html b/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-006.html
index dccb799ea87..f716ce42a89 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-006.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-size-replaced-006.html
@@ -20,9 +20,9 @@
 <div>abc</div>
 <video></video><br>
 <video controls></video><br>
-<img src="../support/60x60-green.png"><br>
+<img src="support/60x60-green.png"><br>
 <picture>
-<source srcset="../support/60x60-green.png">
+<source srcset="support/60x60-green.png">
     <img>
 </picture><br>
 <canvas></canvas><br>
diff --git a/tests/wpt/web-platform-tests/css/css-contain/support/60x60-green.png b/tests/wpt/web-platform-tests/css/css-contain/support/60x60-green.png
new file mode 100644
index 00000000000..b3c8cf3eb4c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-contain/support/60x60-green.png
diff --git a/tests/wpt/web-platform-tests/css/css-contain/support/60x60-red.png b/tests/wpt/web-platform-tests/css/css-contain/support/60x60-red.png
new file mode 100644
index 00000000000..823f125b8e4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-contain/support/60x60-red.png
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-wrap-006.html b/tests/wpt/web-platform-tests/css/css-flexbox/flex-wrap-006.html
new file mode 100644
index 00000000000..e616412c2b2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flex-wrap-006.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<title>CSS Flexbox Test: Tests correct block size with percentages and dynamic changes</title>
+<link rel="author" title="Google LLC" href="http://www.google.com">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=999253" />
+<link rel="help" href="https://drafts.csswg.org/css-flexbox/#cross-sizing" />
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<!-- Each item should stretch to the size of the flex line. Because the first
+     item has no explicit height, the percentage should resolve to zero in
+     the line height calculation stage, so the second item should determine
+     the total height (500px at first, 100px after the change). When the first
+     item gets relaid out for stretching, the percentage can resolve.
+     The bug that motivated this testcase resolved the line height using
+     the previous post-stretching height of the first flex item (and
+     therefore resolves the percentage against 500px), which is incorrect.
+  -->
+<div id="flex" style="display: flex; flex-wrap: wrap;">
+  <div>
+    <div style="height: 100%; background: green; width: 100px;"></div>
+  </div>
+  <div style="height: 500px;" id="item"></div>
+</div>
+
+<script>
+var flex = document.getElementById("flex");
+flex.offsetHeight;
+var item2 = document.getElementById("item");
+item2.style.height = "100px";
+</script>
+
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-static-position-table-cell.html b/tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-static-position-table-cell.html
new file mode 100644
index 00000000000..3a28b205f24
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-position/position-absolute-dynamic-static-position-table-cell.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<link rel="help" href="https://www.w3.org/TR/css-position-3/" />
+<meta name="assert" content="This test checks that a dynamic change in constraints calculates the static position correctly for table-cells."/>
+<style>
+#table-cell {
+  position: relative;
+  display: table-cell;
+  vertical-align: middle;
+
+  width: 100px;
+  height: 100px;
+  background: red;
+}
+
+#target {
+  position: absolute;
+  translate: 0 -50px;
+
+  width: 100px;
+  height: 100px;
+  background: green;
+}
+</style>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div id="table-cell">
+  <div id="target" style="top: 0;"></div>
+</div>
+<script>
+document.body.offsetTop;
+document.getElementById('target').style.top = 'auto';
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/block-fit-content-as-initial-ref.html b/tests/wpt/web-platform-tests/css/css-sizing/block-fit-content-as-initial-ref.html
new file mode 100644
index 00000000000..7fdc142534e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/block-fit-content-as-initial-ref.html
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<body>
+  <div class='parent'>
+    <img class='child' src='../support/60x60-green.png'>
+  </div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/block-fit-content-as-initial.html b/tests/wpt/web-platform-tests/css/css-sizing/block-fit-content-as-initial.html
new file mode 100644
index 00000000000..7c9422cb5bc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/block-fit-content-as-initial.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<title>CSS Test: Test `fit-content` for block axis behaves the same as the initial value</title>
+<link rel="match" href="block-fit-content-as-initial-ref.html">
+<link rel="help" href="https://www.w3.org/TR/css-sizing-3/#valdef-width-fit-content-length-percentage">
+<link rel="author" title="Koji Ishii" href="mailto:kojii@chromium.org">
+<style>
+.parent {
+  height: fit-content;
+}
+.child {
+  max-height: 100%;
+}
+</style>
+<body>
+  <div class='parent'>
+    <img class='child' src='../support/60x60-green.png'>
+  </div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-white-space-crash.html b/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-white-space-crash.html
new file mode 100644
index 00000000000..2bea6aed780
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-white-space-crash.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<title>CSS Text Test: A combination of `overflow-wrap: break-word` and `white-space` should not crash</title>
+<link rel="help" href="https://crbug.com/988832">
+<link rel="author" title="Koji Ishii" href="mailto:kojii@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+div {
+  width: 10ch;
+  border: 1px blue solid;
+  overflow-wrap: break-word;
+}
+inline-block {
+  display: inline-block;
+  position: relative;
+  width: 3ch;
+  height: 1em;
+  background: orange;
+}
+</style>
+<body>
+<div>
+  123 56 <span style="white-space: pre"><inline-block></inline-block> <span style="white-space: normal">Flash</span></span> and
+</div>
+<script>
+test(() => { });
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-zero-percent-height.html b/tests/wpt/web-platform-tests/css/css-values/calc-zero-percent-height.html
new file mode 100644
index 00000000000..ffb2ecd6dc9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-values/calc-zero-percent-height.html
@@ -0,0 +1,30 @@
+<!doctype html>
+<link rel="help" href="https://www.w3.org/TR/css-values-4/#calc-computed-value">
+<link rel="help" href="https://www.w3.org/TR/CSS2/visudet.html#the-height-property">
+<link rel="author" title="Xiaocheng Hu" href="mailto:xiaochengh@chromium.org">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<title>0% in calc() should be preserved</title>
+<script>
+CSS.registerProperty({
+  name: '--custom-height',
+  syntax: '<length-percentage>',
+  initialValue: 'calc(0% + 0px)',
+  inherits: false
+});
+</script>
+<style>
+.height-filler {
+  height: 100px;
+}
+
+.test {
+  width: 100px;
+  height: var(--custom-height);
+  background-color: green;
+}
+</style>
+<p>Test passes if there is a filled green square.</p>
+<div class="test">
+  <div class="height-filler">
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-variables/vars-font-shorthand-001.html b/tests/wpt/web-platform-tests/css/css-variables/vars-font-shorthand-001.html
index 3c280547fb3..e10aa87c494 100644
--- a/tests/wpt/web-platform-tests/css/css-variables/vars-font-shorthand-001.html
+++ b/tests/wpt/web-platform-tests/css/css-variables/vars-font-shorthand-001.html
@@ -4,6 +4,7 @@
 <link rel="help" href="https://www.w3.org/TR/css-variables-1/#variables-in-shorthands">
 <link rel="match" href="reference/vars-font-shorthand-001-ref.html">
 <meta name="flags" content="ahem">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style>
 
 div {
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-003.html b/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-003.html
index c938c905ae0..70a61a9e344 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-003.html
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-003.html
@@ -7,7 +7,7 @@
 <meta name="assert" content="When an orthogonal flow's parent doesn't have a definite block size and the nearest ancestor scroller does have a fixed height, use that, making sure you stick with the content height.">
 <meta name="flags" content="">
 <style>
-body > div {
+#scroller {
   font-family: monospace; /* to be able to reliably measure things in ch*/
   font-size: 20px;
   height: 8ch;
@@ -15,12 +15,11 @@ body > div {
   overflow: hidden;
   color: transparent;
   position: relative; /* to act as a container of #red */
-  writing-mode: vertical-lr;
   padding: 1ch 0;
 }
 
-div > div { padding-bottom: 2ch; } /* so that the content height of the parent and of the fixed size scrolling ancestor are different */
-div > div > div { writing-mode: vertical-rl; }
+#parent { padding-bottom: 2ch; } /* so that the content height of the parent and of the fixed size scrolling ancestor are different */
+#ortho { writing-mode: vertical-rl; }
 
 span {
   background: green;
@@ -38,9 +37,11 @@ span {
 
 <p>Test passes if there is a <strong>green rectangle</strong> below and <strong>no red</strong>.
 
-<div>
-  <aside id="red">0</aside>
-  <div><div>0 0 0 0 <span>0</span> 0 0 0</div></div> <!-- If this div take its height from
-  the height of its scrollable ancestor, it should wrap just right for the green 0 to
-  overlap with the red one. -->
+<div id=scroller>
+  <aside id=red>0</aside>
+  <div id=parent>
+    <div id=ortho>0 0 0 0 <span>0</span> 0 0 0</div>
+    <!-- If this div take its height from the height of its scrollable ancestor,
+         it should wrap just right for the green 0 to overlap with the red one. -->
+  </div>
 </div>
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-005.html b/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-005.html
index ee324898ffe..5eb832ff36e 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-005.html
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-005.html
@@ -7,7 +7,7 @@
 <meta name="assert" content="When an orthogonal flow's parent doesn't have a definite block size and the nearest ancestor scroller does a have fixed height, use that whole height, even if some other content already consumes some of it.">
 <meta name="flags" content="">
 <style>
-body > div {
+#scroller {
   font-family: monospace; /* to be able to reliably measure things in ch*/
   font-size: 20px;
   height: 8ch;
@@ -17,8 +17,8 @@ body > div {
   position: relative; /* to act as a container of #red */
 }
 
-div > div { padding-bottom: 2ch; } /* so that the content height of the parent and of the fixed size scrolling ancestor are different */
-div > div > div { writing-mode: vertical-rl; }
+#parent { padding-bottom: 2ch; } /* so that the content height of the parent and of the fixed size scrolling ancestor are different */
+#ortho { writing-mode: vertical-rl; }
 
 span {
   background: green;
@@ -41,9 +41,12 @@ span {
 
 <p>Test passes if there is a <strong>green rectangle</strong> below and <strong>no red</strong>.
 
-<div>
+<div id=scroller>
   <aside id="red">0</aside>
-  <div><aside id="spacer"></aside><div>0 0 0 0 <span>0</span> 0 0 0</div></div>
+  <div id=parent>
+    <aside id=spacer></aside>
+    <div id=ortho>0 0 0 0 <span>0</span> 0 0 0</div>
+  </div>
   <!-- If the inner div take its height from the height of its scrollable
   ancestor, it should wrap just right for the green 0 to overlap with the red
   one. If instead it takes it size from the remaining height after having
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-009.html b/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-009.html
index 5e26975999e..94f083af584 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-009.html
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-009.html
@@ -9,7 +9,7 @@
 <style>
 body { margin-top: 0; margin-bottom: 0; } /* Shouldn't matter, but in some browsers does. -007 tests this aspect specifically. */
 :root { overflow: hidden; }
-div {
+#ortho {
   writing-mode: vertical-rl;
   font-family: monospace;
   font-size: 20px;
@@ -17,7 +17,7 @@ div {
 }
 .spacer { /* using 5 spacers of 20vh each instead of a single large one, so
              that the line would wrap between spacers if it ends up being
-             shorter thatn 100vh*/
+             shorter than 100vh*/
   display: inline-block;
   height: calc(20vh - 0.1px); /*Using this instead of 20vh, to account for accumulation of rounding errors, that might make 5*20vh taller than 100vh in some browsers*/
 }
@@ -38,18 +38,21 @@ span {
   left: 0; top: 0;
 }
 
-section {
+#scroller {
   overflow: hidden;
-  writing-mode: vertical-rl;
+  writing-mode: vertical-lr;
   height: 120vh;
 }
-section > section {
+#parent {
   writing-mode: horizontal-tb;
+  width: 8em; /* avoid triggering intrinsic sizing bugs */
 }
 </style>
 
 <p>Test passes if there is a <strong>green rectangle</strong> below and <strong>no red</strong>.
 
-<section>
-<div><aside id="red">0</aside><aside class="spacer"></aside><aside class="spacer"></aside><aside class="spacer"></aside><aside class="spacer"></aside><aside class="spacer"></aside><aside class="spacer"></aside><aside class="spacer"></aside><aside class="spacer"></aside><aside class="spacer"></aside><aside class="spacer"></aside> <span>0</span></div>
-</section>
+<div id=scroller>
+  <div id=parent>
+    <div id=ortho><aside id="red">0</aside><aside class="spacer"></aside><aside class="spacer"></aside><aside class="spacer"></aside><aside class="spacer"></aside><aside class="spacer"></aside><aside class="spacer"></aside><aside class="spacer"></aside><aside class="spacer"></aside><aside class="spacer"></aside><aside class="spacer"></aside> <span>0</span></div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-013.html b/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-013.html
index 1ffd6564ad0..4cb6b237285 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-013.html
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-013.html
@@ -7,7 +7,7 @@
 <meta name="assert" content="When an orthogonal flow's parent doesn't have a definite block size and the nearest ancestor scroller does have a fixed height, use that, increased by the min-height if it is set and is larger (same as -003, with min-height).">
 <meta name="flags" content="">
 <style>
-body > div {
+#scroller {
   font-family: monospace; /* to be able to reliably measure things in ch*/
   font-size: 20px;
   height: 4ch;
@@ -16,12 +16,11 @@ body > div {
   overflow: hidden;
   color: transparent;
   position: relative; /* to act as a container of #red */
-  writing-mode: vertical-lr;
   padding: 1ch 0;
 }
 
-div > div { padding-bottom: 2ch; } /* so that the content height of the parent and of the fixed size scrolling ancestor are different */
-div > div > div { writing-mode: vertical-rl; }
+#parent { padding-bottom: 2ch; } /* so that the content height of the parent and of the fixed size scrolling ancestor are different */
+#ortho { writing-mode: vertical-rl; }
 
 span {
   background: green;
@@ -39,9 +38,11 @@ span {
 
 <p>Test passes if there is a <strong>green rectangle</strong> below and <strong>no red</strong>.
 
-<div>
-  <aside id="red">0</aside>
-  <div><div>0 0 0 0 <span>0</span> 0 0 0</div></div> <!-- If this div take its height from
-  the height of its scrollable ancestor, it should wrap just right for the green 0 to
-  overlap with the red one. -->
+<div id=scroller>
+  <aside id=red>0</aside>
+  <div id=parent>
+    <div id=ortho>0 0 0 0 <span>0</span> 0 0 0</div>
+    <!-- If this div take its height from the height of its scrollable ancestor,
+         it should wrap just right for the green 0 to overlap with the red one. -->
+  </div>
 </div>
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-014.html b/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-014.html
index e0e41fb6b1a..8e955cf5902 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-014.html
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-014.html
@@ -7,7 +7,7 @@
 <meta name="assert" content="When an orthogonal flow's parent doesn't have a definite block size and the nearest ancestor scroller does a have fixed height, use that whole height increased by min-height if that's larger, even if some other content already consumes some of it (same as -005, with min-height).">
 <meta name="flags" content="">
 <style>
-body > div {
+#scroller {
   font-family: monospace; /* to be able to reliably measure things in ch*/
   font-size: 20px;
   height: 4ch;
@@ -18,8 +18,8 @@ body > div {
   position: relative; /* to act as a container of #red */
 }
 
-div > div { padding-bottom: 2ch; } /* so that the content height of the parent and of the fixed size scrolling ancestor are different */
-div > div > div { writing-mode: vertical-rl; }
+#parent { padding-bottom: 2ch; } /* so that the content height of the parent and of the fixed size scrolling ancestor are different */
+#ortho { writing-mode: vertical-rl; }
 
 span {
   background: green;
@@ -42,9 +42,12 @@ span {
 
 <p>Test passes if there is a <strong>green rectangle</strong> below and <strong>no red</strong>.
 
-<div>
+<div id=scroller>
   <aside id="red">0</aside>
-  <div><aside id="spacer"></aside><div>0 0 0 0 <span>0</span> 0 0 0</div></div>
+  <div id=parent>
+    <aside id=spacer></aside>
+    <div id=ortho>0 0 0 0 <span>0</span> 0 0 0</div>
+  </div>
   <!-- If the inner div take its height from the height of its scrollable
   ancestor, it should wrap just right for the green 0 to overlap with the red
   one. If instead it takes it size from the remaining height after having
diff --git a/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-016.html b/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-016.html
index 15038868b80..ba398032ba7 100644
--- a/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-016.html
+++ b/tests/wpt/web-platform-tests/css/css-writing-modes/available-size-016.html
@@ -9,7 +9,7 @@
 <style>
 body { margin-top: 0; margin-bottom: 0; } /* Shouldn't matter, but in some browsers does. -007 tests this aspect specifically. */
 :root { overflow: hidden; }
-div {
+#ortho {
   writing-mode: vertical-rl;
   font-family: monospace;
   font-size: 20px;
@@ -38,19 +38,22 @@ span {
   left: 0; top: 0;
 }
 
-section {
+#scroller {
   overflow: hidden;
-  writing-mode: vertical-rl;
+  writing-mode: vertical-lr;
   height: 40vh;
   min-height: 120vh;
 }
-section > section {
+#parent {
   writing-mode: horizontal-tb;
+  width: 8em; /* avoid triggering intrinsic sizing bugs */
 }
 </style>
 
 <p>Test passes if there is a <strong>green rectangle</strong> below and <strong>no red</strong>.
 
-<section>
-<div><aside id="red">0</aside><aside class="spacer"></aside><aside class="spacer"></aside><aside class="spacer"></aside><aside class="spacer"></aside><aside class="spacer"></aside><aside class="spacer"></aside><aside class="spacer"></aside><aside class="spacer"></aside><aside class="spacer"></aside><aside class="spacer"></aside> <span>0</span></div>
-</section>
+<div id=scroller>
+  <div id=parent>
+    <div id=ortho><aside id="red">0</aside><aside class="spacer"></aside><aside class="spacer"></aside><aside class="spacer"></aside><aside class="spacer"></aside><aside class="spacer"></aside><aside class="spacer"></aside><aside class="spacer"></aside><aside class="spacer"></aside><aside class="spacer"></aside><aside class="spacer"></aside> <span>0</span></div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/docs/reviewing-tests/index.md b/tests/wpt/web-platform-tests/docs/reviewing-tests/index.md
index 2f6ee822fcc..e313f84596d 100644
--- a/tests/wpt/web-platform-tests/docs/reviewing-tests/index.md
+++ b/tests/wpt/web-platform-tests/docs/reviewing-tests/index.md
@@ -46,10 +46,10 @@ collaborator before it can be merged.
 
 ## Notifications
 
-META.yml files are used only to indicate who should be notified of pull
+META.yml files are used to indicate who should be notified of pull
 requests.  If you are interested in receiving notifications of proposed
-changes to tests in a given directory, feel free to add yourself to the
-META.yml file.
+changes to tests in a given directory, feel free to add your GitHub account
+username to the `suggested_reviewers` list in the META.yml file.
 
 ## Finding contributions to review
 
diff --git a/tests/wpt/web-platform-tests/docs/test-suite-design.md b/tests/wpt/web-platform-tests/docs/test-suite-design.md
index adc6810f38f..6a104e2f1d4 100644
--- a/tests/wpt/web-platform-tests/docs/test-suite-design.md
+++ b/tests/wpt/web-platform-tests/docs/test-suite-design.md
@@ -32,6 +32,13 @@ For example, tests in HTML for ["The History
 interface"](https://html.spec.whatwg.org/multipage/history.html#the-history-interface)
 are located in `html/browsers/history/the-history-interface/`.
 
+Many directories also include a file named `META.yml`. This file may define any
+of the following properties:
+
+- `spec` - a link to the specification covered by the tests in the directory
+- `suggested_reviewers` - a list of GitHub account username belonging to
+  people who are notified when pull requests modify files in the directory
+
 Various resources that tests depend on are in `common`, `images`, `fonts`,
 `media`, and `resources`.
 
diff --git a/tests/wpt/web-platform-tests/dom/idlharness.window.js b/tests/wpt/web-platform-tests/dom/idlharness.window.js
index 7d87aeaa337..24b56cf05ad 100644
--- a/tests/wpt/web-platform-tests/dom/idlharness.window.js
+++ b/tests/wpt/web-platform-tests/dom/idlharness.window.js
@@ -42,6 +42,11 @@ idl_test(
       NodeList: ['document.querySelectorAll("script")'],
       HTMLCollection: ['document.body.children'],
       DOMTokenList: ['document.body.classList'],
+      XPathEvaluator: ['new XPathEvaluator()'],
+      XPathExpression: ['document.createExpression("//*")'],
+      // Skipped due to https://github.com/web-platform-tests/wpt/issues/18827:
+      // XPathNSResolver: ['document.createNSResolver(document.body)'],
+      XPathResult: ['document.evaluate("//*", document.body)'],
     });
   }
 );
diff --git a/tests/wpt/web-platform-tests/domxpath/README.md b/tests/wpt/web-platform-tests/domxpath/README.md
new file mode 100644
index 00000000000..918997b1646
--- /dev/null
+++ b/tests/wpt/web-platform-tests/domxpath/README.md
@@ -0,0 +1,9 @@
+# XPath
+
+This directory contains tests for [XPath](https://www.w3.org/TR/DOM-Level-3-XPath/).
+
+See [whatwg/dom#67](https://github.com/whatwg/dom/issues/67) for getting XPath
+better specified.
+
+Because the XPath interfaces are defined in the DOM Standard, the idlharness.js
+tests are in [/dom]([/dom) instead of here.
diff --git a/tests/wpt/web-platform-tests/domxpath/interfaces.tentative.html b/tests/wpt/web-platform-tests/domxpath/interfaces.tentative.html
deleted file mode 100644
index 9036ad834a7..00000000000
--- a/tests/wpt/web-platform-tests/domxpath/interfaces.tentative.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!doctype html>
-<title>XPath tests</title>
-<!-- This is a tentative test because there's no real spec for XPath IDL.
-     The closest thing is: -->
-<link rel="help" href="https://wiki.whatwg.org/wiki/DOM_XPath">
-<script src='/resources/testharness.js'></script>
-<script src='/resources/testharnessreport.js'></script>
-<script src='/resources/WebIDLParser.js'></script>
-<script src='/resources/idlharness.js'></script>
-<script type='text/plain'>
-[Exposed=Window]
-interface XPathResult {
-  const unsigned short      ANY_TYPE                       = 0;
-  const unsigned short      NUMBER_TYPE                    = 1;
-  const unsigned short      STRING_TYPE                    = 2;
-  const unsigned short      BOOLEAN_TYPE                   = 3;
-  const unsigned short      UNORDERED_NODE_ITERATOR_TYPE   = 4;
-  const unsigned short      ORDERED_NODE_ITERATOR_TYPE     = 5;
-  const unsigned short      UNORDERED_NODE_SNAPSHOT_TYPE   = 6;
-  const unsigned short      ORDERED_NODE_SNAPSHOT_TYPE     = 7;
-  const unsigned short      ANY_UNORDERED_NODE_TYPE        = 8;
-  const unsigned short      FIRST_ORDERED_NODE_TYPE        = 9;
-
-  readonly attribute unsigned short resultType;
-  readonly attribute unrestricted double numberValue;
-  // Maybe "DOMString?".
-  readonly attribute DOMString stringValue;
-  readonly attribute boolean booleanValue;
-  readonly attribute Node? singleNodeValue;
-  readonly attribute boolean          invalidIteratorState;
-  readonly attribute unsigned long    snapshotLength;
-  Node?               iterateNext();
-  Node?               snapshotItem(unsigned long index);
-};
-
-[Exposed=Window]
-interface XPathExpression {
-  XPathResult evaluate(Node contextNode,
-                       optional unsigned short type,
-                       optional XPathResult? result);
-};
-
-callback interface XPathNSResolver {
-  DOMString? lookupNamespaceURI(DOMString? prefix);
-};
-
-interface mixin XPathEvaluatorBase {
-  [NewObject] XPathExpression createExpression(DOMString expression,
-                                               optional XPathNSResolver? resolver);
-  XPathNSResolver    createNSResolver(Node nodeResolver);
-  XPathResult        evaluate(DOMString expression,
-                              Node contextNode,
-                              optional XPathNSResolver? resolver,
-                              optional unsigned short type,
-                              optional XPathResult? result);
-};
-
-[Exposed=Window, Constructor]
-interface XPathEvaluator {};
-
-XPathEvaluator includes XPathEvaluatorBase;
-</script>
-<script type='text/plain' class='untested'>
-interface Document {};
-Document includes XPathEvaluatorBase;
-</script>
-<script>
-"use strict";
-var evaluator = document;
-var resolver = function() {};
-var resolver2 = document.createNSResolver(document.documentElement);
-var expression = document.createExpression("//*", resolver);
-var result = document.evaluate("//*", document.documentElement, resolver, 0, null);
-
-var idlArray;
-setup(function() {
-  idlArray = new IdlArray();
-  [].forEach.call(document.querySelectorAll("script[type=text\\/plain]"), function(node) {
-    if (node.className == "untested") {
-      idlArray.add_untested_idls(node.textContent);
-    } else {
-      idlArray.add_idls(node.textContent);
-    }
-  });
-  idlArray.add_objects({
-    Document: ["document"],
-    XPathExpression: ["expression"],
-    XPathResolver: ["resolver", "resolver2"],
-    XPathResult: ["result"]
-  });
-});
-idlArray.test();
-</script>
diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/intrinsicsize-with-unsized-media.tentative.https.sub.html b/tests/wpt/web-platform-tests/feature-policy/experimental-features/intrinsicsize-with-unsized-media.tentative.https.sub.html
deleted file mode 100644
index 9d4757f81eb..00000000000
--- a/tests/wpt/web-platform-tests/feature-policy/experimental-features/intrinsicsize-with-unsized-media.tentative.https.sub.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE html>
-<body>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-'use strict';
-
-const srcs = [
-  "/feature-policy/experimental-features/resources/image.svg",
-  "/feature-policy/experimental-features/resources/image.jpg",
-  "/feature-policy/experimental-features/resources/image.png",
-];
-
-// Set new attribute, and wait til the media element is repainted.
-function updateAttribute(e, attribute, value) {
-  return new Promise(resolve => {
-    requestAnimationFrame(() => requestAnimationFrame(() => resolve()));
-    e.setAttribute(attribute, value);
-  });
-}
-
-// Test intrinsicSize attribute with image element.
-for (var src of srcs) {
-  promise_test(async() => {
-    var img = document.createElement('IMG');
-    document.body.appendChild(img);
-    img.src = src;
-    await new Promise(resolve =>
-      img.addEventListener('load', () => resolve(), {once: true}));
-    assert_equals(img.width, 300, 'width');
-    assert_equals(img.height, 150, 'height');
-    assert_equals(img.naturalWidth, 300, 'naturalWidth');
-    assert_equals(img.naturalHeight, 150, 'naturalHeight');
-
-    await updateAttribute(img, 'width', '800');
-    assert_equals(img.width, 800, 'width');
-    assert_equals(img.height, 400, 'height');
-    assert_equals(img.naturalWidth, 300, 'naturalWidth');
-    assert_equals(img.naturalHeight, 150, 'naturalHeight');
-
-    await updateAttribute(img, 'intrinsicSize', '400 x 500');
-    assert_equals(img.width, 800, 'width');
-    assert_equals(img.height, 1000, 'height');
-    assert_equals(img.naturalWidth, 400, 'naturalWidth');
-    assert_equals(img.naturalHeight, 500, 'naturalHeight');
-
-    await updateAttribute(img, 'style', 'height:800px;');
-    assert_equals(img.width, 800, 'width');
-    assert_equals(img.height, 800, 'height');
-    assert_equals(img.naturalWidth, 400, 'naturalWidth');
-    assert_equals(img.naturalHeight, 500, 'naturalHeight');
-
-    await updateAttribute(img, 'width', '');
-    assert_equals(img.width, 640, 'width');
-    assert_equals(img.height, 800, 'height');
-    assert_equals(img.naturalWidth, 400, 'naturalWidth');
-    assert_equals(img.naturalHeight, 500, 'naturalHeight');
-
-    await updateAttribute(img, 'intrinsicSize', '');
-    assert_equals(img.width, 1600, 'width');
-    assert_equals(img.height, 800, 'height');
-    assert_equals(img.naturalWidth, 300, 'naturalWidth');
-    assert_equals(img.naturalHeight, 150, 'naturalHeight');
-
-    await updateAttribute(img, 'style', '');
-    assert_equals(img.width, 300, 'width');
-    assert_equals(img.height, 150, 'height');
-    assert_equals(img.naturalWidth, 300, 'naturalWidth');
-    assert_equals(img.naturalHeight, 150, 'naturalHeight');
-  }, 'Test image with src=' + src);
-}
-
-// Test intrinsicSize attribute with video element.
-promise_test(async() => {
-  var video = document.createElement('video');
-  document.body.appendChild(video);
-  video.src = "/feature-policy/experimental-features/resources/video.ogv";
-  await new Promise(resolve =>
-  video.addEventListener('canplaythrough', () => resolve(), {once: true}));
-  assert_equals(video.getBoundingClientRect().width, 300, 'width');
-  assert_equals(video.getBoundingClientRect().height, 150, 'height');
-  assert_equals(video.videoWidth, 300, 'videoWidth');
-  assert_equals(video.videoHeight, 150, 'videoHeight');
-
-  await updateAttribute(video, 'width', '800');
-  assert_equals(video.getBoundingClientRect().width, 800, 'width');
-  assert_equals(video.getBoundingClientRect().height, 400, 'height');
-  assert_equals(video.videoWidth, 300, 'videoWidth');
-  assert_equals(video.videoHeight, 150, 'videoHeight');
-
-  await updateAttribute(video, 'intrinsicSize', '400 x 500');
-  assert_equals(video.getBoundingClientRect().width, 800, 'width');
-  assert_equals(video.getBoundingClientRect().height, 1000, 'width');
-  assert_equals(video.videoWidth, 400, 'videoWidth');
-  assert_equals(video.videoHeight, 500, 'videoHeight');
-
-  await updateAttribute(video, 'style', 'height:800px;');
-  assert_equals(video.getBoundingClientRect().width, 800, 'width');
-  assert_equals(video.getBoundingClientRect().height, 800, 'height');
-  assert_equals(video.videoWidth, 400, 'videoWidth');
-  assert_equals(video.videoHeight, 500, 'videoHeight');
-
-  await updateAttribute(video, 'width', '');
-  assert_equals(video.getBoundingClientRect().width, 640, 'width');
-  assert_equals(video.getBoundingClientRect().height, 800, 'height');
-  assert_equals(video.videoWidth, 400, 'videoWidth');
-  assert_equals(video.videoHeight, 500, 'videoHeight');
-
-  await updateAttribute(video, 'intrinsicSize', '');
-  assert_equals(video.getBoundingClientRect().width, 1600, 'width');
-  assert_equals(video.getBoundingClientRect().height, 800, 'height');
-  assert_equals(video.videoWidth, 300, 'videoWidth');
-  assert_equals(video.videoHeight, 150, 'videoHeight');
-
-  await updateAttribute(video, 'style', '');
-  assert_equals(video.getBoundingClientRect().width, 300, 'width');
-  assert_equals(video.getBoundingClientRect().height, 150, 'height');
-  assert_equals(video.videoWidth, 300, 'videoWidth');
-  assert_equals(video.videoHeight, 150, 'videoHeight');
-}, 'Test video');
-</script>
-</body>
diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/intrinsicsize-with-unsized-media.tentative.https.sub.html.headers b/tests/wpt/web-platform-tests/feature-policy/experimental-features/intrinsicsize-with-unsized-media.tentative.https.sub.html.headers
deleted file mode 100644
index db2dcbc1929..00000000000
--- a/tests/wpt/web-platform-tests/feature-policy/experimental-features/intrinsicsize-with-unsized-media.tentative.https.sub.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Feature-Policy: unsized-media 'none'
diff --git a/tests/wpt/web-platform-tests/fetch/sec-metadata/redirect/multiple-redirect-https-downgrade-upgrade.tentative.sub.html b/tests/wpt/web-platform-tests/fetch/sec-metadata/redirect/multiple-redirect-https-downgrade-upgrade.tentative.sub.html
index cede6712264..dc6d2d0ec1f 100644
--- a/tests/wpt/web-platform-tests/fetch/sec-metadata/redirect/multiple-redirect-https-downgrade-upgrade.tentative.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/sec-metadata/redirect/multiple-redirect-https-downgrade-upgrade.tentative.sub.html
@@ -38,8 +38,8 @@
     }, "Https downgrade-upgrade font => No headers");
   });
 
-  promise_test(() =>
-    requestViaImage(secureRedirectURL + encodeURIComponent(insecureRedirectURL + encodeURIComponent("https://{{host}}:{{ports[https][0]}}/common/security-features/subresource/image.py")))
+  promise_test(() => {
+    return requestViaImage(secureRedirectURL + encodeURIComponent(insecureRedirectURL + encodeURIComponent("https://{{host}}:{{ports[https][0]}}/common/security-features/subresource/image.py")))
       .then(result => {
          headers = result.headers;
          got = {
@@ -56,7 +56,8 @@
            "user": undefined,
            "mode": undefined,
          });
-  }), "Https downgrade-upgrade image => No headers");
+      });
+  }, "Https downgrade-upgrade image => No headers");
 </script>
 <script src="https://{{host}}:{{ports[https][0]}}/fetch/api/resources/redirect.py?location=http%3A%2F%2F{{host}}%3A{{ports[http][0]}}%2Ffetch%2Fapi%2Fresources%2Fredirect.py%3Flocation%3Dhttps%253A%252F%252F{{host}}%253A{{ports[https][0]}}%252Ffetch%252Fsec-metadata%252Fresources%252Fecho-as-script.py"></script>
 <script>
diff --git a/tests/wpt/web-platform-tests/fetch/sec-metadata/redirect/redirect-http-upgrade.tentative.sub.html b/tests/wpt/web-platform-tests/fetch/sec-metadata/redirect/redirect-http-upgrade.tentative.sub.html
index 4f173d9808a..bfb7ea73e80 100644
--- a/tests/wpt/web-platform-tests/fetch/sec-metadata/redirect/redirect-http-upgrade.tentative.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/sec-metadata/redirect/redirect-http-upgrade.tentative.sub.html
@@ -37,8 +37,8 @@
     }, "Http upgrade font => No headers");
   });
 
-  promise_test(() =>
-    requestViaImage(insecureRedirectURL + encodeURIComponent("https://{{host}}:{{ports[https][0]}}/common/security-features/subresource/image.py"))
+  promise_test(() => {
+    return requestViaImage(insecureRedirectURL + encodeURIComponent("https://{{host}}:{{ports[https][0]}}/common/security-features/subresource/image.py"))
       .then(result => {
          headers = result.headers;
          got = {
@@ -55,7 +55,8 @@
            "user": undefined,
            "mode": undefined,
          });
-  }), "Http upgrade image => No headers");
+      });
+  }, "Http upgrade image => No headers");
 </script>
 <script src="http://{{host}}:{{ports[http][0]}}/fetch/api/resources/redirect.py?location=https%3A%2F%2F{{host}}%3A{{ports[https][0]}}%2Ffetch%2Fsec-metadata%2Fresources%2Fecho-as-script.py"></script>
 <script>
diff --git a/tests/wpt/web-platform-tests/fetch/sec-metadata/redirect/redirect-https-downgrade.tentative.sub.html b/tests/wpt/web-platform-tests/fetch/sec-metadata/redirect/redirect-https-downgrade.tentative.sub.html
index 817843828c1..8972bd0b646 100644
--- a/tests/wpt/web-platform-tests/fetch/sec-metadata/redirect/redirect-https-downgrade.tentative.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/sec-metadata/redirect/redirect-https-downgrade.tentative.sub.html
@@ -38,7 +38,7 @@
   });
 
   promise_test(() =>
-    requestViaImage(secureRedirectURL + encodeURIComponent("http://{{host}}:{{ports[http][0]}}/common/security-features/subresource/image.py"))
+    return requestViaImage(secureRedirectURL + encodeURIComponent("http://{{host}}:{{ports[http][0]}}/common/security-features/subresource/image.py"))
       .then(result => {
          headers = result.headers;
          got = {
diff --git a/tests/wpt/web-platform-tests/fetch/sec-metadata/resources/redirectTestHelper.sub.js b/tests/wpt/web-platform-tests/fetch/sec-metadata/resources/redirectTestHelper.sub.js
index ad78702269d..c28af6476aa 100644
--- a/tests/wpt/web-platform-tests/fetch/sec-metadata/resources/redirectTestHelper.sub.js
+++ b/tests/wpt/web-platform-tests/fetch/sec-metadata/resources/redirectTestHelper.sub.js
@@ -78,7 +78,7 @@ function RunCommonRedirectTests(testNamePrefix, urlHelperMethod, expectedResults
       e.onload = e => {
         fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
           .then(response => response.text())
-          .then(text => assert_header_equals(text, expectedResults))
+          .then(t.step_func(text => assert_header_equals(text, expectedResults)))
           .then(_ => resolve())
           .catch(e => reject(e));
         };
@@ -102,7 +102,7 @@ function RunCommonRedirectTests(testNamePrefix, urlHelperMethod, expectedResults
       e.onload = e => {
       fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
         .then(response => response.text())
-        .then(text => assert_header_equals(text, expectedResults))
+        .then(t.step_func(text => assert_header_equals(text, expectedResults)))
         .then(_ => resolve())
         .catch(e => reject(e));
       };
@@ -154,7 +154,7 @@ function RunCommonRedirectTests(testNamePrefix, urlHelperMethod, expectedResults
       e.onload = e => {
         fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
           .then(response => response.text())
-          .then(text => assert_header_equals(text, expectedResults))
+          .then(t.step_func(text => assert_header_equals(text, expectedResults)))
           .then(_ => resolve())
           .catch(e => reject(e));
       };
@@ -171,7 +171,7 @@ function RunCommonRedirectTests(testNamePrefix, urlHelperMethod, expectedResults
       el.onload = t.step_func(_ => {
         fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
           .then(response => response.text())
-          .then(text => assert_header_equals(text, expectedResults))
+          .then(t.step_func(text => assert_header_equals(text, expectedResults)))
           .then(_ => resolve());
       });
       video.appendChild(el);
diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/resets.html b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/resets.html
index ae4da454014..052adca4c5b 100644
--- a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/resets.html
+++ b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/form-controls/resets.html
@@ -1,5 +1,6 @@
 <!doctype html>
 <title>default style resets</title>
+<meta name="viewport" content="width=device-width">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <style>
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/svg/intrinsicsize/intrinsicsize-svg-image-ref.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/svg/intrinsicsize/intrinsicsize-svg-image-ref.html
deleted file mode 100644
index 41ddd757eca..00000000000
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/svg/intrinsicsize/intrinsicsize-svg-image-ref.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<body>
-<svg width=200 height=200>
-  <image href="/images/background.png" width="32" height="32"/>
-</svg>
-<svg width=200 height=200>
-  <image href="/images/background.png" width="300" height="150"/>
-</svg>
-<svg width=400 height=400>
-  <image href="/images/background.png" width="300" height="150"/>
-</svg>
-<svg width=200 height=200>
-  <image href="/images/background.png" width="300" height="150"/>
-</svg>
-<svg width=200 height=200>
-  <image href="/images/background.png" height="50" width="100"/>
-</svg>
-<svg width=200 height=200>
-  <image href="/images/background.png" width="100" height="100"/>
-</svg>
-</body>
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/svg/intrinsicsize/intrinsicsize-svg-image.tentative.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/svg/intrinsicsize/intrinsicsize-svg-image.tentative.html
deleted file mode 100644
index a0943169d0a..00000000000
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/svg/intrinsicsize/intrinsicsize-svg-image.tentative.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<link rel="match" href="intrinsicsize-svg-image-ref.html">
-<meta name="assert" content="test">
-<body>
-<svg width=200 height=200>
-  <image href="/images/background.png"/>
-</svg>
-<svg width=200 height=200>
-  <image href="/images/background.png" intrinsicsize="300x150"/>
-</svg>
-<svg width=400 height=400>
-  <image href="/images/background.png" intrinsicsize="300x150"/>
-</svg>
-<svg width=200 height=200>
-  <image href="/images/background.png" intrinsicsize="300x150" width="300"/>
-</svg>
-<svg width=200 height=200>
-  <image href="/images/background.png" intrinsicsize="300x150" height="50"/>
-</svg>
-<svg width=200 height=200>
-  <image href="/images/background.png" intrinsicsize="300x150" width="100" height="100"/>
-</svg>
-</body>
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/img.complete.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/img.complete.html
index 42113cdd2ff..dcacf43db2d 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/img.complete.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/img.complete.html
@@ -12,6 +12,7 @@
 <img id="imgTestTag3" style="width: 80px; height:auto;">
 <img id="imgTestTag4">
 <img id="imgTestTag5">
+<div id="image-container"></div>
 
 <script>
   var imageInstance = document.createElement('img');
@@ -27,8 +28,58 @@
   }, "img src and srcset omitted");
 
   test(function() {
+    var img = document.createElement("img");
+    assert_true(img.complete);
+  }, "img src and srcset omitted on newly-created image");
+
+  test(function() {
+    var cont = document.getElementById("image-container");
+    this.add_cleanup(() => { cont.innerHTML = "" });
+    var img = document.createElement("img");
+    cont.appendChild(img);
+    assert_true(img.complete);
+  }, "img src and srcset omitted on newly-created-and-inserted image");
+
+  test(function() {
+    var cont = document.getElementById("image-container");
+    this.add_cleanup(() => { cont.innerHTML = "" });
+    cont.innerHTML = "<img>";
+    assert_true(cont.querySelector("img").complete);
+  }, "img src and srcset omitted on newly-created-via-innerHTML image");
+
+  test(function() {
     assert_true(document.getElementById("imgTestTag2").complete);
-  }, "img src and srcset empty");
+  }, "img src empty and srcset omitted");
+
+  test(function() {
+    var img = document.createElement("img");
+    img.setAttribute("src", "");
+    assert_true(img.complete);
+  }, "img src empty and srcset omitted on newly-created image");
+
+  test(function() {
+    var cont = document.getElementById("image-container");
+    this.add_cleanup(() => { cont.innerHTML = "" });
+    var img = document.createElement("img");
+    img.setAttribute("src", "");
+    cont.appendChild(img);
+    assert_true(img.complete);
+  }, "img src empty and srcset omitted on newly-created-and-inserted image");
+
+  test(function() {
+    var cont = document.getElementById("image-container");
+    this.add_cleanup(() => { cont.innerHTML = "" });
+    cont.innerHTML = "<img src=''>";
+    assert_true(cont.querySelector("img").complete);
+  }, "img src empty and srcset omitted on newly-created-via-innerHTML image");
+
+  test(function() {
+    var img = document.createElement("img");
+    img.src = location.href;
+    assert_false(img.complete, "Should have a load going");
+    img.removeAttribute("src");
+    assert_true(img.complete);
+  }, "img src and srcset omitted on image after it started a load");
 
   // test if set to true after img is completely available
   var t = async_test("async src complete test");
@@ -103,4 +154,57 @@
     assert_true(img4.complete);
     t2.done();
   });
+
+  var t3 = async_test("async src removal test");
+  t3.step(function() {
+    var img = document.createElement("img");
+    assert_true(img.complete);
+    img.src = `3.jpg?nocache=${Math.random()}`;
+    assert_false(img.complete);
+    img.onload = this.step_func_done(() => {
+      assert_true(img.complete);
+      img.removeAttribute("src");
+      assert_true(img.complete, "Should be complete, since we removed the src");
+    });
+  });
+
+  var t4 = async_test("async srcset removal test");
+  t4.step(function() {
+    var img = document.createElement("img");
+    assert_true(img.complete);
+    img.srcset = `3.jpg?nocache=${Math.random()} 1x`;
+    assert_false(img.complete);
+    img.onload = this.step_func_done(() => {
+      assert_true(img.complete);
+      img.removeAttribute("srcset");
+      assert_true(img.complete, "Should be complete, since we removed the srcset");
+    });
+  });
+
+  var t5 = async_test("async src available image lookup test");
+  t5.step(function() {
+    var preload = document.createElement("img");
+    var url = `3.jpg?nocache=${Math.random()}`;
+    preload.src = url;
+    preload.onload = this.step_func_done(function() {
+      var img = document.createElement("img");
+      assert_true(img.complete);
+      img.src = url;
+      assert_true(img.complete, "Should be complete because we should hit the available image cache");
+    });
+  });
+
+  var t6 = async_test("async pending request test");
+  t6.step(function() {
+    var img = document.createElement("img");
+    img.src = `3.jpg?nocache=${Math.random()}`;
+    img.onload = this.step_func_done(function() {
+      assert_true(img.complete);
+      img.src = `3.jpg?nocache=${Math.random()}`;
+      // This is not strictly per spec, but that's a spec bug.  See
+      // https://github.com/whatwg/html/issues/4884
+      assert_false(img.complete, "Should not be complete because we have started a new load");
+    });
+  });
+
 </script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/intrinsicsize/intrinsicsize-with-responsive-images.tentative.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/intrinsicsize/intrinsicsize-with-responsive-images.tentative.html
deleted file mode 100644
index 739765c0d44..00000000000
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/intrinsicsize/intrinsicsize-with-responsive-images.tentative.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE html>
-<body>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-'use strict';
-
-const srcs = [
-  "/images/green.svg",
-  "/images/green.png",
-];
-
-for (var src of srcs) {
-  async_test(t => {
-    var img = document.createElement('IMG');
-    img.intrinsicSize = '400 x 500';
-    var expected_intrinsic_width = 400;
-    var expected_intrinsic_height = 500;
-    var expected_width = expected_intrinsic_width;
-    var expected_height = expected_intrinsic_height;
-
-    document.body.appendChild(img);
-    img.addEventListener('load', t.step_func(() => {
-      assert_equals(img.width, expected_width, 'width');
-      assert_equals(img.height, expected_height, 'height');
-      assert_equals(img.naturalWidth, expected_intrinsic_width, 'naturalWidth');
-      assert_equals(img.naturalHeight, expected_intrinsic_height, 'naturalHeigh');
-      t.done();
-    }));
-    img.srcset = src + ' 3x';
-  }, 'Test image ' + src + ' with no specified sizes, width, or height');
-
-  async_test(t => {
-    var img = document.createElement('IMG');
-    img.intrinsicSize = '400 x 500';
-    img.width = '800'; /* 2x of intrinsic width */
-    var expected_intrinsic_width = 400;
-    var expected_intrinsic_height = 500;
-    var expected_width = expected_intrinsic_width * 2;
-    var expected_height = expected_intrinsic_height * 2;
-
-    document.body.appendChild(img);
-    img.addEventListener('load', t.step_func(() => {
-      assert_equals(img.width, expected_width, 'width');
-      assert_equals(img.height, expected_height, 'height');
-      assert_equals(img.naturalWidth, expected_intrinsic_width, 'naturalWidth');
-      assert_equals(img.naturalHeight, expected_intrinsic_height, 'naturalHeigh');
-      t.done();
-    }));
-    img.srcset = src + ' 3x';
-  }, 'Test image ' + src + ' with width = 800, no specified sizes, or height');
-
-  async_test(t => {
-    var img = document.createElement('IMG');
-    img.intrinsicSize = '400 x 500';
-    img.width = '800';
-    img.style = 'height:800px;';
-    var expected_intrinsic_width = 400;
-    var expected_intrinsic_height = 500;
-    var expected_width = 800;
-    var expected_height = 800;
-
-    document.body.appendChild(img);
-    img.addEventListener('load', t.step_func(() => {
-      assert_equals(img.width, expected_width, 'width');
-      assert_equals(img.height, expected_height, 'height');
-      assert_equals(img.naturalWidth, expected_intrinsic_width, 'naturalWidth');
-      assert_equals(img.naturalHeight, expected_intrinsic_height, 'naturalHeigh');
-      t.done();
-    }));
-    img.srcset = src + ' 3x';
-  }, 'Test image ' + src + ' with width = 800, height = 800, and no specified sizes');
-}
-
-async_test(t => {
-  var img = document.createElement('IMG');
-  img.intrinsicSize = '400 x 500';
-  img.sizes = '100px';
-  var expected_intrinsic_width = 100;
-  var expected_intrinsic_height = 125;
-  var expected_width = 100;
-  var expected_height = 125;
-
-  document.body.appendChild(img);
-  img.addEventListener('load', t.step_func(() => {
-    assert_equals(img.width, expected_width, 'width');
-    assert_equals(img.height, expected_height, 'height');
-    assert_equals(img.naturalWidth, expected_intrinsic_width, 'naturalWidth');
-    assert_equals(img.naturalHeight, expected_intrinsic_height, 'naturalHeigh');
-    t.done();
-  }));
-  img.srcset = '/images/background.png 32w';
-}, 'Test image (32 x 32) with sizes = 100 and srcset descriptor = 32w');
-
-</script>
-</body>
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/intrinsicsize/intrinsicsize-without-unsized-media.tentative.https.sub.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/intrinsicsize/intrinsicsize-without-unsized-media.tentative.https.sub.html
deleted file mode 100644
index 4192e567fcc..00000000000
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/intrinsicsize/intrinsicsize-without-unsized-media.tentative.https.sub.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-<body>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-'use strict';
-
-const srcs = [
-  "/images/green.svg",
-  "/images/green.png",
-];
-
-// Set new attribute, and wait til the media element is repainted.
-function updateAttribute(e, attribute, value) {
-  return new Promise(resolve => {
-    requestAnimationFrame(() => requestAnimationFrame(() => resolve()));
-    e.setAttribute(attribute, value);
-  });
-}
-
-for (var src of srcs) {
-  promise_test(async() => {
-    var img = document.createElement('IMG');
-    document.body.appendChild(img);
-    img.src = src;
-    await new Promise(resolve =>
-      img.addEventListener('load', () => resolve(), {once: true}));
-    await updateAttribute(img, 'intrinsicSize', '400 x 500');
-    assert_equals(img.width, 400, 'width');
-    assert_equals(img.height, 500, 'height');
-    assert_equals(img.naturalWidth, 400, 'naturalWidth');
-    assert_equals(img.naturalHeight, 500, 'naturalHeight');
-
-    await updateAttribute(img, 'width', '800');
-    assert_equals(img.width, 800, 'width');
-    assert_equals(img.height, 1000, 'height');
-    assert_equals(img.naturalWidth, 400, 'naturalWidth');
-    assert_equals(img.naturalHeight, 500, 'naturalHeight');
-
-    await updateAttribute(img, 'style', 'height:800px;');
-    assert_equals(img.width, 800, 'width');
-    assert_equals(img.height, 800, 'height');
-    assert_equals(img.naturalWidth, 400, 'naturalWidth');
-    assert_equals(img.naturalHeight, 500, 'naturalHeight');
-
-    await updateAttribute(img, 'width', '');
-    assert_equals(img.width, 640, 'width');
-    assert_equals(img.height, 800, 'height');
-    assert_equals(img.naturalWidth, 400, 'naturalWidth');
-    assert_equals(img.naturalHeight, 500, 'naturalHeight');
-
-    await updateAttribute(img, 'style', 'height:800px; writing-mode: vertical-rl;');
-    assert_equals(img.width, 640, 'width');
-    assert_equals(img.height, 800, 'height');
-    assert_equals(img.naturalWidth, 400, 'naturalWidth');
-    assert_equals(img.naturalHeight, 500, 'naturalHeight');
-
-    await updateAttribute(img, 'style', 'height:800px; writing-mode: horizontal-tb;');
-    assert_equals(img.width, 640, 'width');
-    assert_equals(img.height, 800, 'height');
-    assert_equals(img.naturalWidth, 400, 'naturalWidth');
-    assert_equals(img.naturalHeight, 500, 'naturalHeight');
-  }, 'Test intrinsicsize for html image element, src=' + src);
-}
-</script>
-</body>
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/intrinsicsize/intrinsicsize-without-unsized-media.tentative.https.sub.html.headers b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/intrinsicsize/intrinsicsize-without-unsized-media.tentative.https.sub.html.headers
deleted file mode 100644
index 4fbf3f5addd..00000000000
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/intrinsicsize/intrinsicsize-without-unsized-media.tentative.https.sub.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Feature-Policy: unsized-media *
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/intrinsicsize/intrinsicsize-without-unsized-media.tentative.https.sub.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/intrinsicsize/intrinsicsize-without-unsized-media.tentative.https.sub.html
deleted file mode 100644
index d749d5576e6..00000000000
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/intrinsicsize/intrinsicsize-without-unsized-media.tentative.https.sub.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<body>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-'use strict';
-
-promise_test(async() => {
-  var video = document.createElement('video');
-  document.body.appendChild(video);
-  video.src = "/images/pattern.ogv";
-  await new Promise(resolve =>
-    video.addEventListener('canplaythrough', () => resolve(), {once: true}));
-  video.intrinsicSize = '400 x 500';
-  assert_equals(video.getBoundingClientRect().width, 400, 'width');
-  assert_equals(video.getBoundingClientRect().height, 500, 'height');
-  assert_equals(video.videoWidth, 400, 'naturalWidth');
-  assert_equals(video.videoHeight, 500, 'naturalHeight');
-
-  video.width = '800';
-  assert_equals(video.getBoundingClientRect().width, 800, 'width');
-  assert_equals(video.getBoundingClientRect().height, 1000, 'height');
-  assert_equals(video.videoWidth, 400, 'naturalWidth');
-  assert_equals(video.videoHeight, 500, 'naturalHeight');
-
-  video.style = 'height:800px;';
-  assert_equals(video.getBoundingClientRect().width, 800, 'width');
-  assert_equals(video.getBoundingClientRect().height, 800, 'height');
-  assert_equals(video.videoWidth, 400, 'naturalWidth');
-  assert_equals(video.videoHeight, 500, 'naturalHeight');
-
-  video.removeAttribute('width');
-  assert_equals(video.getBoundingClientRect().width, 640, 'width');
-  assert_equals(video.getBoundingClientRect().height, 800, 'height');
-  assert_equals(video.videoWidth, 400, 'naturalWidth');
-  assert_equals(video.videoHeight, 500, 'naturalHeight');
-}, 'Test intrinsicsize for html video element');
-</script>
-</body>
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/intrinsicsize/intrinsicsize-without-unsized-media.tentative.https.sub.html.headers b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/intrinsicsize/intrinsicsize-without-unsized-media.tentative.https.sub.html.headers
deleted file mode 100644
index 4fbf3f5addd..00000000000
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-video-element/intrinsicsize/intrinsicsize-without-unsized-media.tentative.https.sub.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Feature-Policy: unsized-media *
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/autofocus-on-stable-document.html b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/autofocus-on-stable-document.html
new file mode 100644
index 00000000000..47e3e3fd0ab
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/autofocus-on-stable-document.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/utils.js"></script>
+
+<body>
+<script>
+'use strict';
+
+promise_test(async t => {
+  await waitForLoad(window);
+  await timeOut(t, 1000);
+  let element = document.createElement('input');
+  element.autofocus = true;
+  document.body.appendChild(element);
+  await waitUntilStableAutofocusState();
+  assert_equals(document.activeElement, element);
+}, 'Autofocus should work if an element with autofocus is inserted into a ' +
+    'document which was loaded some time ago.');
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/first-reconnected.html b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/first-reconnected.html
new file mode 100644
index 00000000000..99ee9198d1b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/first-reconnected.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/utils.js"></script>
+
+<input autofocus id="i1">
+<input autofocus id="i2">
+<script>
+"use strict";
+
+promise_test(async () => {
+  const input1 = document.querySelector("#i1");
+  const input2 = document.querySelector("#i2");
+  input1.remove();
+  input2.parentNode.insertBefore(input1, input2);
+
+  await waitUntilStableAutofocusState();
+  assert_equals(document.activeElement, input2);
+}, 'The second autofocus element wins if the first autofocus element was ' +
+   'disconnected and reconnected before flushing the autofocus candidates.');
+</script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/first-when-later-but-before.html b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/first-when-later-but-before.html
index 0267f46627f..f361463401b 100644
--- a/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/first-when-later-but-before.html
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/first-when-later-but-before.html
@@ -6,22 +6,21 @@
 
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="resources/utils.js"></script>
 
 <input autofocus>
 
 <script>
 "use strict";
 
-const input1 = document.querySelector("input");
+promise_test(async () => {
+  const input1 = document.querySelector("input");
+  const input2 = document.createElement("input");
+  input2.autofocus = true;
+  document.body.prepend(input2);
 
-const input2 = document.createElement("input");
-input2.autofocus = true;
-document.body.prepend(input2);
-
-step_timeout(() => {
-    assert_equals(document.activeElement, input1);
-    assert_not_equals(document.activeElement, input2);
-
-    done();
-}, 100);
+  await waitUntilStableAutofocusState();
+  assert_equals(document.activeElement, input1);
+  assert_not_equals(document.activeElement, input2);
+}, 'The temporally first autofocus in the document wins, even if an element is inserted later that is previous in the document tree.');
 </script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/first-when-later.html b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/first-when-later.html
index 9ced437f4a9..1d64b863a16 100644
--- a/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/first-when-later.html
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/first-when-later.html
@@ -6,22 +6,21 @@
 
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="resources/utils.js"></script>
 
 <input autofocus>
 
 <script>
 "use strict";
 
-const input1 = document.querySelector("input");
+promise_test(async () => {
+  const input1 = document.querySelector("input");
+  const input2 = document.createElement("input");
+  input2.autofocus = true;
+  document.body.appendChild(input2);
 
-const input2 = document.createElement("input");
-input2.autofocus = true;
-document.body.appendChild(input2);
-
-step_timeout(() => {
-    assert_equals(document.activeElement, input1);
-    assert_not_equals(document.activeElement, input2);
-
-    done();
-}, 100);
+  await waitUntilStableAutofocusState();
+  assert_equals(document.activeElement, input1);
+  assert_not_equals(document.activeElement, input2);
+}, 'The first autofocus in the document wins, even if elements are inserted later.');
 </script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/first.html b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/first.html
index de56cf74eda..02ebb79a3e9 100644
--- a/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/first.html
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/first.html
@@ -6,6 +6,7 @@
 
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="resources/utils.js"></script>
 
 <input autofocus>
 <input autofocus>
@@ -13,12 +14,11 @@
 <script>
 "use strict";
 
-const [input1, input2] = document.querySelectorAll("input");
+promise_test(async () => {
+  const [input1, input2] = document.querySelectorAll("input");
 
-step_timeout(() => {
+  await waitUntilStableAutofocusState();
   assert_equals(document.activeElement, input1);
   assert_not_equals(document.activeElement, input2);
-
-  done();
-}, 100);
+}, 'The first autofocus element in the document should win.');
 </script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/focusable-area-in-top-document.html b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/focusable-area-in-top-document.html
new file mode 100644
index 00000000000..327040eeeeb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/focusable-area-in-top-document.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/utils.js"></script>
+
+<iframe srcdoc="<input><script>document.querySelector('input').focus();</script>"></iframe>
+
+<script>
+'use strict';
+
+promise_test(async () => {
+  await waitForLoad(window);
+  let iframe = document.querySelector('iframe');
+  assert_equals(document.activeElement, iframe, 'Prereq: IFRAME should be focused');
+
+  let input = document.createElement('input');
+  input.autofocus = true;
+  document.body.appendChild(input);
+
+  await waitUntilStableAutofocusState();
+  assert_equals(document.activeElement, iframe, 'activeElement should not be changed');
+  assert_not_equals(document.activeElement, input);
+}, 'If topDocument\'s focused area is not topDocument, autofocus is not processed.');
+</script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/no-sandboxed-automatic-features.html b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/no-sandboxed-automatic-features.html
new file mode 100644
index 00000000000..991373d3363
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/no-sandboxed-automatic-features.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/utils.js"></script>
+
+<iframe sandbox srcdoc="<input autofocus>"></iframe>
+
+<script>
+'use strict';
+
+promise_test(async () => {
+  await waitForLoad(window);
+  await waitUntilStableAutofocusState();
+  assert_not_equals(document.activeElement, document.querySelector('iframe'));
+}, 'If the sandboxed automatic features browsing context flag is set, ' +
+    'autofocus in the browsing context should not be handled.');
+</script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/queue-non-focusable.html b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/queue-non-focusable.html
new file mode 100644
index 00000000000..e3b556035d3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/queue-non-focusable.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/utils.js"></script>
+
+<textarea autofocus disabled></textarea>
+<select autofocus></select>
+
+<script>
+'use strict';
+
+promise_test(async () => {
+  const [textarea, select] = document.querySelectorAll('[autofocus]');
+  textarea.disabled = false;
+
+  await waitUntilStableAutofocusState();
+  assert_equals(document.activeElement, textarea);
+  assert_not_equals(document.activeElement, select);
+}, 'If the first autofocus element is not focusable, but becomes focusable before a frame, it should be focused.');
+</script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/resources/erase-first.css b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/resources/erase-first.css
new file mode 100644
index 00000000000..bbbcf799393
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/resources/erase-first.css
@@ -0,0 +1,3 @@
+#first {
+  display: none;
+}
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/resources/frame-with-autofocus-element.html b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/resources/frame-with-autofocus-element.html
new file mode 100644
index 00000000000..985cba41494
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/resources/frame-with-autofocus-element.html
@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<body>
+<div id="anchor1"></div>
+<input autofocus>
+</body>
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/resources/moving-autofocus-to-parent.html b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/resources/moving-autofocus-to-parent.html
new file mode 100644
index 00000000000..fc6c298a46e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/resources/moving-autofocus-to-parent.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<body>
+<script>
+const input = document.createElement('input');
+input.autofocus = true;
+document.body.appendChild(input);
+input.autofocus = false;
+window.opener.document.body.appendChild(input);
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/resources/utils.js b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/resources/utils.js
index f3690a633ff..0eeb5a9f0ad 100644
--- a/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/resources/utils.js
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/resources/utils.js
@@ -6,6 +6,19 @@ function waitForEvent(target, type, options) {
   });
 }
 
+function waitForAnimationFrame(w) {
+  let targetWindow = w || window;
+  return new Promise((resolve, reject) => {
+    targetWindow.requestAnimationFrame(resolve);
+  });
+}
+
+function waitForEvent(target, type, options) {
+  return new Promise((resolve, reject) => {
+    target.addEventListener(type, resolve, options);
+  });
+}
+
 function waitForLoad(target) {
   return waitForEvent(target, 'load');
 }
@@ -21,7 +34,9 @@ function timeOut(test, ms) {
 // function.
 // Exception: If the document has script-blocking style sheets, this function
 // doesn't work well.
-async function waitUntilStableAutofocusState(test) {
-  // TODO: Update this for https://github.com/web-platform-tests/wpt/pull/17929
-  await timeOut(test, 100);
+async function waitUntilStableAutofocusState(w) {
+  let targetWindow = w || window;
+  // Awaiting two animation frames is an easy way to determine autofocus state.
+  await waitForAnimationFrame(targetWindow);
+  await waitForAnimationFrame(targetWindow);
 }
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/skip-another-top-level-browsing-context.html b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/skip-another-top-level-browsing-context.html
new file mode 100644
index 00000000000..d392b903f07
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/skip-another-top-level-browsing-context.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/utils.js"></script>
+<script>
+'use strict';
+
+promise_test(async () => {
+  let w = window.open('resources/moving-autofocus-to-parent.html');
+  await waitForLoad(w);
+  await waitUntilStableAutofocusState(w);
+  assert_equals(w.document.activeElement, w.document.body);
+  assert_equals(document.activeElement, document.body);
+  w.close();
+}, 'Autofocus elements queued in another top-level browsing context\'s ' +
+   'documents should be skipped.');
+</script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/skip-document-with-fragment.html b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/skip-document-with-fragment.html
new file mode 100644
index 00000000000..a4301e13516
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/skip-document-with-fragment.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/utils.js"></script>
+
+<iframe src="resources/frame-with-autofocus-element.html#anchor1"></iframe>
+<iframe src="resources/frame-with-autofocus-element.html#non-existent-anchor"></iframe>
+
+<script>
+'use strict';
+
+promise_test(async () => {
+  await waitForLoad(window);
+  await waitUntilStableAutofocusState();
+  assert_equals(document.activeElement, document.body,
+      'Autofocus elements in iframes should not be focused.');
+
+  let input = document.createElement('input');
+  input.autofocus = true;
+  document.body.appendChild(input);
+  await waitUntilStableAutofocusState();
+  assert_equals(document.activeElement, input);
+}, 'Autofocus elements in iframed documents with URL fragments should be skipped.');
+
+promise_test(async () => {
+  let w = window.open('resources/frame-with-autofocus-element.html#xpointer(//body)');
+  await waitForLoad(w);
+  await waitUntilStableAutofocusState(w);
+  assert_equals(w.document.activeElement, w.document.body);
+  w.close();
+}, 'Autofocus elements in top-level browsing context\'s documents with URI fragments should be skipped.');
+</script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/skip-non-focusable.html b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/skip-non-focusable.html
new file mode 100644
index 00000000000..008371d8e16
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/skip-non-focusable.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/utils.js"></script>
+
+<textarea autofocus disabled></textarea>
+<select autofocus></select>
+
+<script>
+'use strict';
+
+promise_test(async () => {
+  const [textarea, select] = document.querySelectorAll('[autofocus]');
+
+  await waitUntilStableAutofocusState();
+  assert_not_equals(document.activeElement, textarea);
+  assert_equals(document.activeElement, select);
+}, 'Non-focusable autofocus element is skipped.');
+</script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/skip-not-fully-active.html b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/skip-not-fully-active.html
new file mode 100644
index 00000000000..32008b3019e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/skip-not-fully-active.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/utils.js"></script>
+
+<iframe srcdoc="<input autofocus><script>window.frameElement.remove();</script>"></iframe>
+
+<script>
+'use strict';
+
+promise_test(async () => {
+  let iframe = document.querySelector('iframe');
+  let iframeDocument = iframe.contentDocument;
+  await waitForLoad(window);
+  assert_not_equals(document.activeElement, iframe);
+  assert_equals(iframeDocument.activeElement, iframeDocument.body);
+}, 'Autofocus element in not-fully-active document should be skipped.');
+</script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/spin-by-blocking-style-sheet.html b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/spin-by-blocking-style-sheet.html
new file mode 100644
index 00000000000..22a4c3573cc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/spin-by-blocking-style-sheet.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/utils.js"></script>
+<link rel="stylesheet" href="resources/erase-first.css?pipe=trickle(d1)">
+
+<input id="first" autofocus>
+<input id="second" autofocus>
+
+<script>
+'use strict';
+
+promise_test(async () => {
+  await waitForEvent(document.body, 'focus', {capture:true});
+  assert_equals(document.activeElement.id, 'second');
+}, 'Script-blocking style sheet should pause flushing autofocus candidates.');
+</script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/supported-elements.html b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/supported-elements.html
index cbd21010ffe..398577e7d51 100644
--- a/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/supported-elements.html
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/supported-elements.html
@@ -11,7 +11,7 @@ promise_test(async t => {
   await waitForLoad(w);
   t.add_cleanup(() => { w.close(); });
   w.document.body.innerHTML = '<div contenteditable=true autofocus></div>';
-  await waitUntilStableAutofocusState(t);
+  await waitUntilStableAutofocusState(w);
   assert_equals(w.document.activeElement.tagName, 'DIV');
 }, 'Contenteditable element should support autofocus');
 
@@ -20,7 +20,7 @@ promise_test(async t => {
   await waitForLoad(w);
   t.add_cleanup(() => { w.close(); });
   w.document.body.innerHTML = '<span tabindex=0></span>';
-  await waitUntilStableAutofocusState(t);
+  await waitUntilStableAutofocusState(w);
   assert_equals(w.document.activeElement.tagName, 'SPAN');
 }, 'Element with tabindex should support autofocus');
 
@@ -31,7 +31,7 @@ promise_test(async t => {
   let element = w.document.createElementNS('uri1', 'prefix:local');
   element.setAttribute('autofocus', '');
   w.document.body.appendChild(element);
-  await waitUntilStableAutofocusState(t);
+  await waitUntilStableAutofocusState(w);
   assert_equals(w.document.activeElement.tagName, 'BODY');
 }, 'Non-HTMLElement should not support autofocus');
 </script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/update-the-rendering.html b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/update-the-rendering.html
new file mode 100644
index 00000000000..afaf0926f5b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/autofocus/update-the-rendering.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<link rel="help" href="https://html.spec.whatwg.org/C/#update-the-rendering">
+
+<body>
+<script>
+'use strict';
+
+async_test(t => {
+  t.events = [];
+
+  let iframe = document.createElement('iframe');
+  iframe.addEventListener('load', t.step_func(() => {
+    let w = iframe.contentWindow;
+    w.requestAnimationFrame(t.step_func(() => {
+      t.events.push('animationFrame');
+      w.requestAnimationFrame(t.step_func(() => {
+        t.events.push('animationFrame-should-not-be-recorded');
+      }));
+    }));
+    let element = w.document.createElement('input');
+    element.autofocus = true;
+    element.addEventListener('focus', t.step_func(() => {
+      t.events.push('autofocus');
+      iframe.style.width = '71px';
+    }));
+
+    w.addEventListener('resize', t.step_func_done(() => {
+      t.events.push('resize');
+      assert_array_equals(t.events, ['animationFrame', 'autofocus', 'resize']);
+    }));
+
+    w.document.body.appendChild(element);
+  }));
+  document.body.appendChild(iframe);
+}, '"Flush autofocus candidates" should be happen after the first animation ' +
+    'frame callbacks, and before a resize event in the next iteration of ' +
+    'window event loop.');
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-rangeOverflow.html b/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-rangeOverflow.html
index ca423ef9ed7..fedf2ea4e4f 100644
--- a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-rangeOverflow.html
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-rangeOverflow.html
@@ -106,7 +106,8 @@
         {conditions: {max: "5", value: "1abc"}, expected: false, name: "[target] The value is not a number"},
         {conditions: {max: "5", value: "6"}, expected: true, name: "[target] The value is greater than max(integer)"},
         {conditions: {max: "-5.5", value: "-5.4"}, expected: true, name: "[target] The value is greater than max(floating number)"},
-        {conditions: {max: "-5e-1", value: "5e+2"}, expected: true, name: "[target] The value is greater than max(scientific notation)"}
+        {conditions: {max: "-1", value: "-.8"}, expected: true, name: "[target] The value is greater than max(special floating number)"},
+        {conditions: {max: "-5e-1", value: "5e+2"}, expected: true, name: "[target] The value is greater than max(scientific notation)"},
       ]
     }
    ];
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-rangeUnderflow.html b/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-rangeUnderflow.html
index d6bf86060b1..8ac3aae1279 100644
--- a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-rangeUnderflow.html
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-rangeUnderflow.html
@@ -104,6 +104,7 @@
         {conditions: {min: "5", value: "6abc"}, expected: false, name: "[target] The value is not a number"},
         {conditions: {min: "6", value: "5"}, expected: true, name: "[target] The value is less than min(integer)"},
         {conditions: {min: "-5.4", value: "-5.5"}, expected: true, name: "[target] The value is less than min(floating number)"},
+        {conditions: {min: "1", value: "-.8"}, expected: true, name: "[target] The value is less than min(special floating number)"},
         {conditions: {min: "5e+2", value: "-5e-1"}, expected: true, name: "[target] The value is less than min(scientific notation)"}
       ]
     }
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-stepMismatch.html b/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-stepMismatch.html
index 174ecaf33a2..6d8192bfbfe 100644
--- a/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-stepMismatch.html
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/constraints/form-validation-validity-stepMismatch.html
@@ -66,7 +66,8 @@
       types: ["number"],
       testData: [
         {conditions: {step: "", value: "1"}, expected: false, name: "[target] The step attribute is not set"},
-        {conditions: {step: 2 * 1 * 1, value: ""}, expected: false, name: "[target] The value attibute is empty string"},
+        {conditions: {step: "", value: "-.8"}, expected: true, name: "[target] The step attribute is not set and the value attribute is a floating number"},
+        {conditions: {step: 2 * 1 * 1, value: ""}, expected: false, name: "[target] The value attribute is empty string"},
         {conditions: {step: 2 * 1 * 1, value: "2"}, expected: false, name: "[target] The value must match the step"},
         {conditions: {step: 2 * 1 * 1, value: "3"}, expected: true, name: "[target] The value must mismatch the step"}
       ]
diff --git a/tests/wpt/web-platform-tests/interfaces/appmanifest.idl b/tests/wpt/web-platform-tests/interfaces/appmanifest.idl
index ddfe82dc34d..4a6425829f2 100644
--- a/tests/wpt/web-platform-tests/interfaces/appmanifest.idl
+++ b/tests/wpt/web-platform-tests/interfaces/appmanifest.idl
@@ -3,10 +3,10 @@
 // (https://github.com/tidoust/reffy-reports)
 // Source: Web App Manifest (https://w3c.github.io/manifest/)
 
-[Constructor(DOMString type, optional EventInit eventInitDict = {}),
- Exposed=Window]
+[Exposed=Window]
 interface BeforeInstallPromptEvent : Event {
-    Promise<PromptResponseObject> prompt();
+  constructor(DOMString type, optional EventInit eventInitDict = {});
+  Promise<PromptResponseObject> prompt();
 };
 
 dictionary PromptResponseObject {
diff --git a/tests/wpt/web-platform-tests/interfaces/dom.idl b/tests/wpt/web-platform-tests/interfaces/dom.idl
index 91157033c82..03a0201b16f 100644
--- a/tests/wpt/web-platform-tests/interfaces/dom.idl
+++ b/tests/wpt/web-platform-tests/interfaces/dom.idl
@@ -558,3 +558,51 @@ interface DOMTokenList {
   [CEReactions] stringifier attribute DOMString value;
   iterable<DOMString>;
 };
+
+[Exposed=Window]
+interface XPathResult {
+  const unsigned short ANY_TYPE = 0;
+  const unsigned short NUMBER_TYPE = 1;
+  const unsigned short STRING_TYPE = 2;
+  const unsigned short BOOLEAN_TYPE = 3;
+  const unsigned short UNORDERED_NODE_ITERATOR_TYPE = 4;
+  const unsigned short ORDERED_NODE_ITERATOR_TYPE = 5;
+  const unsigned short UNORDERED_NODE_SNAPSHOT_TYPE = 6;
+  const unsigned short ORDERED_NODE_SNAPSHOT_TYPE = 7;
+  const unsigned short ANY_UNORDERED_NODE_TYPE = 8;
+  const unsigned short FIRST_ORDERED_NODE_TYPE = 9;
+
+  readonly attribute unsigned short resultType;
+  readonly attribute unrestricted double numberValue;
+  readonly attribute DOMString stringValue;
+  readonly attribute boolean booleanValue;
+  readonly attribute Node? singleNodeValue;
+  readonly attribute boolean invalidIteratorState;
+  readonly attribute unsigned long snapshotLength;
+
+  Node? iterateNext();
+  Node? snapshotItem(unsigned long index);
+};
+
+[Exposed=Window]
+interface XPathExpression {
+  // XPathResult.ANY_TYPE = 0
+  XPathResult evaluate(Node contextNode, optional unsigned short type = 0, optional XPathResult? result = null);
+};
+
+callback interface XPathNSResolver {
+  DOMString? lookupNamespaceURI(DOMString? prefix);
+};
+
+interface mixin XPathEvaluatorBase {
+  [NewObject] XPathExpression createExpression(DOMString expression, optional XPathNSResolver? resolver = null);
+  XPathNSResolver createNSResolver(Node nodeResolver);
+  // XPathResult.ANY_TYPE = 0
+  XPathResult evaluate(DOMString expression, Node contextNode, optional XPathNSResolver? resolver = null, optional unsigned short type = 0, optional XPathResult? result = null);
+};
+Document includes XPathEvaluatorBase;
+
+[Exposed=Window, Constructor]
+interface XPathEvaluator {};
+
+XPathEvaluator includes XPathEvaluatorBase;
diff --git a/tests/wpt/web-platform-tests/interfaces/entries-api.idl b/tests/wpt/web-platform-tests/interfaces/entries-api.idl
index 71e80c717b2..548aec13ab7 100644
--- a/tests/wpt/web-platform-tests/interfaces/entries-api.idl
+++ b/tests/wpt/web-platform-tests/interfaces/entries-api.idl
@@ -32,11 +32,11 @@ interface FileSystemEntry {
 interface FileSystemDirectoryEntry : FileSystemEntry {
     FileSystemDirectoryReader createReader();
     void getFile(optional USVString? path,
-                 optional FileSystemFlags options,
+                 optional FileSystemFlags options = {},
                  optional FileSystemEntryCallback successCallback,
                  optional ErrorCallback errorCallback);
     void getDirectory(optional USVString? path,
-                      optional FileSystemFlags options,
+                      optional FileSystemFlags options = {},
                       optional FileSystemEntryCallback successCallback,
                       optional ErrorCallback errorCallback);
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/web-nfc.idl b/tests/wpt/web-platform-tests/interfaces/web-nfc.idl
index 5107cf3b577..8c77339ae86 100644
--- a/tests/wpt/web-platform-tests/interfaces/web-nfc.idl
+++ b/tests/wpt/web-platform-tests/interfaces/web-nfc.idl
@@ -3,8 +3,10 @@
 // (https://github.com/tidoust/reffy-reports)
 // Source: Web NFC API (https://w3c.github.io/web-nfc/)
 
-[Constructor(NDEFMessageInit messageInit), Exposed=Window]
+[Exposed=Window]
 interface NDEFMessage {
+  constructor(NDEFMessageInit messageInit);
+
   readonly attribute USVString url;
   readonly attribute FrozenArray<NDEFRecord> records;
 };
@@ -16,19 +18,24 @@ dictionary NDEFMessageInit {
 
 typedef any NDEFRecordData;
 
-[Constructor(NDEFRecordInit recordInit), Exposed=Window]
+[Exposed=Window]
 interface NDEFRecord {
+  constructor(NDEFRecordInit recordInit);
+
   readonly attribute NDEFRecordType recordType;
   readonly attribute USVString mediaType;
+  readonly attribute USVString id;
 
   USVString? toText();
   [NewObject] ArrayBuffer? toArrayBuffer();
   [NewObject] any toJSON();
+  sequence<NDEFRecord> toRecords();
 };
 
 dictionary NDEFRecordInit {
   NDEFRecordType recordType;
   USVString mediaType;
+  USVString id;
 
   NDEFRecordData data;
 };
@@ -37,21 +44,27 @@ typedef DOMString NDEFRecordType;
 
 typedef (DOMString or ArrayBuffer or NDEFMessageInit) NDEFMessageSource;
 
-[Constructor, SecureContext, Exposed=Window]
+[SecureContext, Exposed=Window]
 interface NFCWriter {
+  constructor();
+
   Promise<void> push(NDEFMessageSource message, optional NFCPushOptions options={});
 };
 
-[Constructor, SecureContext, Exposed=Window]
+[SecureContext, Exposed=Window]
 interface NFCReader : EventTarget {
+  constructor();
+
   attribute EventHandler onreading;
   attribute EventHandler onerror;
 
   void scan(optional NFCScanOptions options={});
 };
 
-[Constructor(DOMString type, NFCReadingEventInit readingEventInitDict), SecureContext, Exposed=Window]
+[SecureContext, Exposed=Window]
 interface NFCReadingEvent : Event {
+  constructor(DOMString type, NFCReadingEventInit readingEventInitDict);
+
   readonly attribute DOMString serialNumber;
   [SameObject] readonly attribute NDEFMessage message;
 };
@@ -61,8 +74,10 @@ dictionary NFCReadingEventInit : EventInit {
   required NDEFMessageInit message;
 };
 
-[Constructor(DOMString type, NFCErrorEventInit errorEventInitDict), SecureContext, Exposed=Window]
+[SecureContext, Exposed=Window]
 interface NFCErrorEvent : Event {
+  constructor(DOMString type, NFCErrorEventInit errorEventInitDict);
+
   readonly attribute DOMException error;
 };
 
diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/css-inline-style-dynamic.tentative-ref.html b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/css-inline-style-dynamic.tentative-ref.html
new file mode 100644
index 00000000000..13f01392736
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/css-inline-style-dynamic.tentative-ref.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8"/>
+<title>MathML 'ElementCSSInlineStyle` Dynamic Tests</title>
+</head>
+<body>
+  <span>This tests that `ElementCSSInlineStyle` interface changes update rendering.</span>
+  <div>
+    <math style="background-color: green"><mspace width="50px" height="100px"/><mspace width="50px" height="100px"/></math>
+  </div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/css-inline-style-dynamic.tentative.html b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/css-inline-style-dynamic.tentative.html
new file mode 100644
index 00000000000..ca3e6794919
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/css-inline-style-dynamic.tentative.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+  <head>
+    <meta charset="utf-8" />
+    <title>MathML 'ElementCSSInlineStyle` Dynamic Tests</title>
+    <link rel="help" href="https://mathml-refresh.github.io/mathml-core/#dom-and-javascript"/>
+    <link rel="match" href="css-inline-style-dynamic.tentative-ref.html"/>
+    <style>
+      #hidden  {
+        visibility: hidden;
+        background-color: green;
+      }
+      #red  {
+        background-color: red;
+      }
+    </style>
+    <meta
+      name="assert"
+      content="MathMLElements ElementCSSInlineStyle interface changes update rendering"
+    />
+    <script type="text/javascript">
+      function test()
+      {
+        document.body.offsetTop; // Update layout
+        document.getElementById("hidden").style.visibility = "visible";
+        document.getElementById("red").style.backgroundColor = "green";
+        document.documentElement.className = "";
+      }
+    </script>
+  </head>
+  <body onload="test()">
+    <span>This tests that `ElementCSSInlineStyle` interface changes update rendering.</span>
+    <div>
+      <math><mspace width="50px" height="100px" id="hidden"/><mspace width="50px" height="100px" id="red"/></math>
+    </div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/generic/mixed-content-test-case.js b/tests/wpt/web-platform-tests/mixed-content/generic/mixed-content-test-case.js
index eb9fc13f7c0..ee34c4973a9 100644
--- a/tests/wpt/web-platform-tests/mixed-content/generic/mixed-content-test-case.js
+++ b/tests/wpt/web-platform-tests/mixed-content/generic/mixed-content-test-case.js
@@ -73,7 +73,7 @@ function MixedContentTestCase(scenario, description, sanityChecker) {
     // We bridge this inconsistency here, and will later pass these information
     // directly from the generated tests and remove this conversion here.
     subresourceType = 'fetch-request';
-    sourceContextList = [{sourceContextType: 'classic-data-worker'}];
+    sourceContextList = [{sourceContextType: 'worker-classic-data'}];
   }
 
   const originTypeConversion = {
diff --git a/tests/wpt/web-platform-tests/mixed-content/generic/test-case.sub.js b/tests/wpt/web-platform-tests/mixed-content/generic/test-case.sub.js
new file mode 100644
index 00000000000..d25986e5c26
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mixed-content/generic/test-case.sub.js
@@ -0,0 +1,127 @@
+/**
+ * @fileoverview Test case for mixed-content in Web Platform Tests.
+ * @author burnik@google.com (Kristijan Burnik)
+ */
+
+// TODO: This function is currently placed and duplicated at:
+// - mixed-content/generic/mixed-content-test-case.js
+// - referrer-policy/generic/referrer-policy-test-case.js
+// but should be moved to /common/security-features/resources/common.js.
+function getSubresourceOrigin(originType) {
+  const httpProtocol = "http";
+  const httpsProtocol = "https";
+  const wsProtocol = "ws";
+  const wssProtocol = "wss";
+
+  const sameOriginHost = "{{host}}";
+  const crossOriginHost = "{{domains[www1]}}";
+
+  // These values can evaluate to either empty strings or a ":port" string.
+  const httpPort = getNormalizedPort(parseInt("{{ports[http][0]}}", 10));
+  const httpsPort = getNormalizedPort(parseInt("{{ports[https][0]}}", 10));
+  const wsPort = getNormalizedPort(parseInt("{{ports[ws][0]}}", 10));
+  const wssPort = getNormalizedPort(parseInt("{{ports[wss][0]}}", 10));
+
+  /**
+    @typedef OriginType
+    @type {string}
+
+    Represents the origin of the subresource request URL.
+    The keys of `originMap` below are the valid values.
+
+    Note that there can be redirects from the specified origin
+    (see RedirectionType), and thus the origin of the subresource
+    response URL might be different from what is specified by OriginType.
+  */
+  const originMap = {
+    "same-https": httpsProtocol + "://" + sameOriginHost + httpsPort,
+    "same-http": httpProtocol + "://" + sameOriginHost + httpPort,
+    "cross-https": httpsProtocol + "://" + crossOriginHost + httpsPort,
+    "cross-http": httpProtocol + "://" + crossOriginHost + httpPort,
+    "same-wss": wssProtocol + "://" + sameOriginHost + wssPort,
+    "same-ws": wsProtocol + "://" + sameOriginHost + wsPort,
+    "cross-wss": wssProtocol + "://" + crossOriginHost + wssPort,
+    "cross-ws": wsProtocol + "://" + crossOriginHost + wsPort,
+  };
+
+  return originMap[originType];
+}
+
+/**
+ * MixedContentTestCase exercises all the tests for checking browser behavior
+ * when resources regarded as mixed-content are requested. A single run covers
+ * only a single scenario.
+ * @param {object} scenario A JSON describing the test arrangement and
+ *     expectation(s). Refer to /mixed-content/spec.src.json for details.
+ * @param {string} description The test scenario verbose description.
+ * @param {SanityChecker} sanityChecker Instance of an object used to check the
+ *     running scenario. Useful in debug mode. See ./sanity-checker.js.
+ *     Run {@code ./tools/generate.py -h} for info on test generating modes.
+ * @return {object} Object wrapping the start method used to run the test.
+ */
+function TestCase(scenario, description, sanityChecker) {
+  sanityChecker.checkScenario(scenario, subresourceMap);
+
+  const redirectionTypeConversion = {
+    "no-redirect": "no-redirect",
+    "keep-scheme": "keep-scheme-redirect",
+    "swap-scheme": "swap-scheme-redirect",
+    "keep-origin": "keep-origin-redirect",
+    "swap-origin": "swap-origin-redirect"
+  };
+  const subresourceTypeConversion = {
+    "beacon": "beacon-request",
+    "fetch": "fetch-request",
+    "xhr": "xhr-request",
+    "websocket": "websocket-request",
+    "worker-classic": "worker-request",
+    "worker-module": "module-worker",
+    "worker-import-data": "module-data-worker-import",
+    "sharedworker-classic": "shared-worker",
+    "worklet-animation": "worklet-animation-top-level",
+    "worklet-audio": "worklet-audio-top-level",
+    "worklet-layout": "worklet-layout-top-level",
+    "worklet-paint": "worklet-paint-top-level",
+    "worklet-animation-import-data": "worklet-animation-data-import",
+    "worklet-audio-import-data": "worklet-audio-data-import",
+    "worklet-layout-import-data": "worklet-layout-data-import",
+    "worklet-paint-import-data": "worklet-paint-data-import"
+  };
+  const subresourceType =
+      subresourceTypeConversion[scenario.subresource] || scenario.subresource;
+
+  const urls = getRequestURLs(subresourceType,
+                              scenario.origin,
+                              redirectionTypeConversion[scenario.redirection]);
+  const checkResult = _ => {
+    // Send request to check if the key has been torn down.
+    return xhrRequest(urls.assertUrl)
+      .then(assertResult => {
+          // Now check if the value has been torn down. If it's still there,
+          // we have blocked the request to mixed-content.
+          assert_equals(assertResult.status, scenario.expectation,
+            "The resource request should be '" + scenario.expectation + "'.");
+        });
+  };
+
+  function runTest() {
+    /** @type {Subresource} */
+    const subresource = {
+      subresourceType: subresourceType,
+      url: urls.testUrl,
+      policyDeliveries: scenario.subresource_policy_deliveries,
+    };
+
+    promise_test(() => {
+      return xhrRequest(urls.announceUrl)
+        // Send out the real resource request.
+        // This should tear down the key if it's not blocked.
+        .then(_ => invokeRequest(subresource, scenario.source_context_list))
+        // We check the key state, regardless of whether the main request
+        // succeeded or failed.
+        .then(checkResult, checkResult);
+      }, description);
+  }  // runTest
+
+  return {start: runTest};
+}
diff --git a/tests/wpt/web-platform-tests/mixed-content/generic/tools/generate.py b/tests/wpt/web-platform-tests/mixed-content/generic/tools/generate.py
index 9c911aa6c41..b80bc8df6bb 100755
--- a/tests/wpt/web-platform-tests/mixed-content/generic/tools/generate.py
+++ b/tests/wpt/web-platform-tests/mixed-content/generic/tools/generate.py
@@ -13,36 +13,25 @@ import generate
 
 class MixedContentConfig(object):
     def __init__(self):
-        self.selection_pattern = '%(subresource)s/' + \
-                                 '%(delivery_type)s/' + \
-                                 '%(delivery_value)s/' + \
-                                 '%(origin)s/' + \
-                                 'top-level/' + \
-                                 '%(redirection)s/'
-
-        self.test_file_path_pattern = self.selection_pattern + \
-                                      '%(spec_name)s/' + \
-                                      '%(name)s.%(source_scheme)s.html'
-
-        self.test_description_template = '''delivery_type: %(delivery_type)s
-delivery_value: %(delivery_value)s
-origin: %(origin)s
-source_scheme: %(source_scheme)s
-context_nesting: top-level
-redirection: %(redirection)s
-subresource: %(subresource)s
-expectation: %(expectation)s
-'''
+        self.selection_pattern = \
+              '%(source_context_list)s.%(delivery_type)s/' + \
+              '%(delivery_value)s/' + \
+              '%(subresource)s/' + \
+              '%(origin)s.%(redirection)s.%(source_scheme)s'
+
+        self.test_file_path_pattern = 'gen/' + self.selection_pattern + '.html'
+
+        self.test_description_template = 'Mixed-Content: Expects %(expectation)s for %(subresource)s to %(origin)s origin and %(redirection)s redirection from %(source_scheme)s context.'
 
         self.test_page_title_template = 'Mixed-Content: %s'
 
-        self.helper_js = '/mixed-content/generic/mixed-content-test-case.js?pipe=sub'
+        self.helper_js = '/mixed-content/generic/test-case.sub.js'
 
         # For debug target only.
         self.sanity_checker_js = '/mixed-content/generic/sanity-checker.js'
         self.spec_json_js = '/mixed-content/spec_json.js'
 
-        self.test_case_name = 'MixedContentTestCase'
+        self.test_case_name = 'TestCase'
 
         script_directory = os.path.dirname(os.path.abspath(__file__))
         self.spec_directory = os.path.abspath(
diff --git a/tests/wpt/web-platform-tests/mixed-content/spec.src.json b/tests/wpt/web-platform-tests/mixed-content/spec.src.json
index 95dc2d318f5..e4844a8016b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/spec.src.json
+++ b/tests/wpt/web-platform-tests/mixed-content/spec.src.json
@@ -10,6 +10,7 @@
           "name": "opt-in-blocks",
           "expansion": "default",
           "source_scheme": "https",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "opt-in",
           "redirection": "*",
@@ -27,6 +28,7 @@
           "name": "no-opt-in-allows",
           "expansion": "default",
           "source_scheme": "https",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": null,
           "redirection": "*",
@@ -52,6 +54,7 @@
           "name": "opt-in-blocks",
           "expansion": "default",
           "source_scheme": "https",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "opt-in",
           "redirection": "*",
@@ -69,6 +72,7 @@
           "name": "no-opt-in-blocks",
           "expansion": "default",
           "source_scheme": "https",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": null,
           "redirection": "*",
@@ -86,11 +90,12 @@
           "name": "ws-downgrade-blocks",
           "expansion": "default",
           "source_scheme": "https",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "*",
           "redirection": "*",
           "subresource": {
-            "blockable": "websocket-request",
+            "blockable": "websocket",
             "optionally-blockable": []
           },
           "origin": [
@@ -111,6 +116,7 @@
           "name": "allowed",
           "expansion": "default",
           "source_scheme": "https",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "*",
           "redirection": [
@@ -130,6 +136,7 @@
           "name": "websocket-allowed",
           "expansion": "default",
           "source_scheme": "https",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "*",
           "redirection": [
@@ -137,7 +144,7 @@
             "keep-scheme"
           ],
           "subresource": {
-            "blockable": "websocket-request",
+            "blockable": "websocket",
             "optionally-blockable": []
           },
           "origin": [
@@ -154,6 +161,7 @@
       "name": "Skip-redundant-no-opt-in",
       "expansion": "*",
       "source_scheme": "*",
+      "source_context_list": "*",
       "delivery_type": "http-rp",
       "delivery_value": null,
       "redirection": "*",
@@ -168,6 +176,7 @@
       "name": "Redundant-subresources",
       "expansion": "*",
       "source_scheme": "*",
+      "source_context_list": "*",
       "delivery_type": "*",
       "delivery_value": "*",
       "redirection": "*",
@@ -184,12 +193,13 @@
       "name": "Skip-origins-not-applicable-to-websockets",
       "expansion": "*",
       "source_scheme": "*",
+      "source_context_list": "*",
       "delivery_type": "*",
       "delivery_value": "*",
       "redirection": "*",
       "subresource": {
         "blockable": [
-          "websocket-request"
+          "websocket"
         ],
         "optionally-blockable": []
       },
@@ -205,6 +215,7 @@
       "name": "Skip-redundant-for-opt-in-method",
       "expansion": "*",
       "source_scheme": "*",
+      "source_context_list": "*",
       "delivery_type": "meta",
       "delivery_value": "opt-in",
       "redirection": [
@@ -219,6 +230,126 @@
       "expectation": "*"
     }
   ],
+  "source_context_schema": {
+    "supported_delivery_type": {
+      "top": [
+        "http-rp",
+        "meta"
+      ],
+      "iframe": [
+        "http-rp",
+        "meta"
+      ],
+      "srcdoc": [
+        "meta"
+      ],
+      "worker-classic": [
+        "http-rp"
+      ],
+      "worker-module": [
+        "http-rp"
+      ],
+      "worker-classic-data": [],
+      "worker-module-data": []
+    },
+    "supported_subresource": {
+      "top": "*",
+      "iframe": "*",
+      "srcdoc": "*",
+      "worker-classic": [
+        "xhr",
+        "fetch",
+        "websocket"
+      ],
+      "worker-module": [
+        "xhr",
+        "fetch",
+        "websocket"
+      ],
+      "worker-classic-data": [
+        "xhr",
+        "fetch",
+        "websocket"
+      ],
+      "worker-module-data": [
+        "xhr",
+        "fetch",
+        "websocket"
+      ]
+    }
+  },
+  "subresource_schema": {
+    "supported_delivery_type": {
+      "script-tag": [],
+      "link-css-tag": [],
+      "xhr": [],
+      "worker-classic": [],
+      "worker-module": [],
+      "worker-import-data": [],
+      "worklet-animation": [],
+      "worklet-audio": [],
+      "worklet-layout": [],
+      "worklet-paint": [],
+      "worklet-animation-import-data": [],
+      "worklet-audio-import-data": [],
+      "worklet-layout-import-data": [],
+      "worklet-paint-import-data": [],
+      "fetch": [],
+      "a-tag": [],
+      "object-tag": [],
+      "picture-tag": [],
+      "websocket": [],
+      "link-prefetch-tag": [],
+      "beacon": [],
+      "img-tag": [],
+      "audio-tag": [],
+      "video-tag": []
+    }
+  },
+  "source_context_list_schema": {
+    "top": {
+      "description": "Policy set by the top-level Document",
+      "sourceContextList": [
+        {
+          "sourceContextType": "top",
+          "policyDeliveries": [
+            "policy"
+          ]
+        }
+      ],
+      "subresourcePolicyDeliveries": []
+    },
+    "worker-classic-data": {
+      "sourceContextList": [
+        {
+          "sourceContextType": "top",
+          "policyDeliveries": [
+            "policy"
+          ]
+        },
+        {
+          "sourceContextType": "worker-classic-data",
+          "policyDeliveries": []
+        }
+      ],
+      "subresourcePolicyDeliveries": []
+    },
+    "worker-module-data": {
+      "sourceContextList": [
+        {
+          "sourceContextType": "top",
+          "policyDeliveries": [
+            "policy"
+          ]
+        },
+        {
+          "sourceContextType": "worker-module-data",
+          "policyDeliveries": []
+        }
+      ],
+      "subresourcePolicyDeliveries": []
+    }
+  },
   "test_expansion_schema": {
     "expansion": [
       "default",
@@ -236,6 +367,11 @@
       null,
       "opt-in"
     ],
+    "source_context_list": [
+      "top",
+      "worker-classic-data",
+      "worker-module-data"
+    ],
     "redirection": [
       "no-redirect",
       "keep-scheme",
@@ -255,26 +391,25 @@
       "blockable": [
         "script-tag",
         "link-css-tag",
-        "xhr-request",
-        "worker-request",
-        "module-worker-top-level",
-        "module-data-worker-import",
-        "classic-data-worker-fetch",
-        "worklet-animation-top-level",
-        "worklet-audio-top-level",
-        "worklet-layout-top-level",
-        "worklet-paint-top-level",
-        "worklet-animation-data-import",
-        "worklet-audio-data-import",
-        "worklet-layout-data-import",
-        "worklet-paint-data-import",
-        "fetch-request",
+        "xhr",
+        "worker-classic",
+        "worker-module",
+        "worker-import-data",
+        "worklet-animation",
+        "worklet-audio",
+        "worklet-layout",
+        "worklet-paint",
+        "worklet-animation-import-data",
+        "worklet-audio-import-data",
+        "worklet-layout-import-data",
+        "worklet-paint-import-data",
+        "fetch",
         "a-tag",
         "object-tag",
         "picture-tag",
-        "websocket-request",
+        "websocket",
         "link-prefetch-tag",
-        "beacon-request"
+        "beacon"
       ],
       "optionally-blockable": [
         "img-tag",
diff --git a/tests/wpt/web-platform-tests/mixed-content/spec_json.js b/tests/wpt/web-platform-tests/mixed-content/spec_json.js
index 0868df220fb..009a853077b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/spec_json.js
+++ b/tests/wpt/web-platform-tests/mixed-content/spec_json.js
@@ -1 +1 @@
-var SPEC_JSON = {"test_expansion_schema": {"origin": ["same-host-https", "same-host-http", "cross-origin-https", "cross-origin-http", "same-host-wss", "same-host-ws", "cross-origin-wss", "cross-origin-ws"], "subresource": {"blockable": ["script-tag", "link-css-tag", "xhr-request", "worker-request", "module-worker-top-level", "module-data-worker-import", "classic-data-worker-fetch", "worklet-animation-top-level", "worklet-audio-top-level", "worklet-layout-top-level", "worklet-paint-top-level", "worklet-animation-data-import", "worklet-audio-data-import", "worklet-layout-data-import", "worklet-paint-data-import", "fetch-request", "a-tag", "object-tag", "picture-tag", "websocket-request", "link-prefetch-tag", "beacon-request"], "optionally-blockable": ["img-tag", "audio-tag", "video-tag"]}, "context_nesting": ["top-level", "sub-level"], "expectation": ["allowed", "blocked"], "expansion": ["default", "override"], "redirection": ["no-redirect", "keep-scheme-redirect", "swap-scheme-redirect"], "opt_in_method": ["no-opt-in", "http-csp", "meta-csp", "img-crossorigin"], "source_scheme": ["http", "https"]}, "specification": [{"test_expansion": [{"origin": ["cross-origin-http", "same-host-http"], "name": "opt-in-blocks", "redirection": "*", "expectation": "blocked", "expansion": "default", "context_nesting": "top-level", "opt_in_method": ["http-csp", "meta-csp"], "source_scheme": "https", "subresource": {"blockable": [], "optionally-blockable": "*"}}, {"origin": ["cross-origin-http", "same-host-http"], "name": "no-opt-in-allows", "redirection": "*", "expectation": "allowed", "expansion": "default", "context_nesting": "top-level", "opt_in_method": "no-opt-in", "source_scheme": "https", "subresource": {"blockable": [], "optionally-blockable": "*"}}], "description": "Test behavior of optionally-blockable content", "specification_url": "http://www.w3.org/TR/mixed-content/#category-optionally-blockable", "name": "optionally-blockable", "title": "Optionally-blockable content"}, {"test_expansion": [{"origin": ["cross-origin-http", "same-host-http"], "name": "opt-in-blocks", "redirection": "*", "expectation": "blocked", "expansion": "default", "context_nesting": "top-level", "opt_in_method": ["http-csp", "meta-csp"], "source_scheme": "https", "subresource": {"blockable": "*", "optionally-blockable": []}}, {"origin": ["cross-origin-http", "same-host-http"], "name": "no-opt-in-blocks", "redirection": "*", "expectation": "blocked", "expansion": "default", "context_nesting": "top-level", "opt_in_method": "no-opt-in", "source_scheme": "https", "subresource": {"blockable": "*", "optionally-blockable": []}}, {"origin": ["cross-origin-ws", "same-host-ws"], "name": "ws-downgrade-blocks", "redirection": "*", "expectation": "blocked", "expansion": "default", "context_nesting": "top-level", "opt_in_method": ["no-opt-in", "http-csp", "meta-csp"], "source_scheme": "https", "subresource": {"blockable": "websocket-request", "optionally-blockable": []}}], "description": "Test behavior of blockable content.", "specification_url": "http://www.w3.org/TR/mixed-content/#category-blockable", "name": "blockable", "title": "Blockable content"}, {"test_expansion": [{"origin": ["same-host-https"], "name": "allowed", "redirection": ["no-redirect", "keep-scheme-redirect"], "expectation": "allowed", "expansion": "default", "context_nesting": "top-level", "opt_in_method": "*", "source_scheme": "https", "subresource": {"blockable": "*", "optionally-blockable": "*"}}, {"origin": ["same-host-wss"], "name": "websocket-allowed", "redirection": ["no-redirect", "keep-scheme-redirect"], "expectation": "allowed", "expansion": "default", "context_nesting": "top-level", "opt_in_method": "*", "source_scheme": "https", "subresource": {"blockable": "websocket-request", "optionally-blockable": []}}], "description": "Test behavior of allowed content.", "specification_url": "http://www.w3.org/TR/mixed-content/", "name": "allowed", "title": "Allowed content"}], "excluded_tests": [{"origin": "*", "name": "Redundant-subresources", "redirection": "*", "expectation": "*", "expansion": "*", "context_nesting": "*", "opt_in_method": "*", "source_scheme": "*", "subresource": {"blockable": ["a-tag"], "optionally-blockable": []}}, {"origin": ["same-host-https", "same-host-http", "cross-origin-https", "cross-origin-http"], "name": "Skip-origins-not-applicable-to-websockets", "redirection": "*", "expectation": "*", "expansion": "*", "context_nesting": "*", "opt_in_method": "*", "source_scheme": "*", "subresource": {"blockable": ["websocket-request"], "optionally-blockable": []}}, {"origin": "*", "name": "TODO-opt-in-method-img-cross-origin", "redirection": "*", "expectation": "*", "expansion": "*", "context_nesting": "*", "opt_in_method": "img-crossorigin", "source_scheme": "*", "subresource": {"blockable": "*", "optionally-blockable": "*"}}, {"origin": "*", "name": "Skip-redundant-for-opt-in-method", "redirection": ["keep-scheme-redirect", "swap-scheme-redirect"], "expectation": "*", "expansion": "*", "context_nesting": "*", "opt_in_method": ["meta-csp", "img-crossorigin"], "source_scheme": "*", "subresource": {"blockable": "*", "optionally-blockable": "*"}}]};
+var SPEC_JSON = {"subresource_schema": {"supported_delivery_type": {"picture-tag": [], "worklet-layout": [], "worklet-paint": [], "img-tag": [], "a-tag": [], "worklet-layout-import-data": [], "worklet-audio-import-data": [], "worklet-animation": [], "websocket": [], "worklet-paint-import-data": [], "video-tag": [], "object-tag": [], "worklet-audio": [], "beacon": [], "worker-module": [], "worker-import-data": [], "script-tag": [], "worklet-animation-import-data": [], "link-css-tag": [], "xhr": [], "worker-classic": [], "link-prefetch-tag": [], "audio-tag": [], "fetch": []}}, "excluded_tests": [{"delivery_value": null, "origin": "*", "delivery_type": "http-rp", "name": "Skip-redundant-no-opt-in", "expectation": "*", "expansion": "*", "redirection": "*", "source_context_list": "*", "source_scheme": "*", "subresource": {"blockable": "*", "optionally-blockable": "*"}}, {"delivery_value": "*", "origin": "*", "delivery_type": "*", "name": "Redundant-subresources", "expectation": "*", "expansion": "*", "redirection": "*", "source_context_list": "*", "source_scheme": "*", "subresource": {"blockable": ["a-tag"], "optionally-blockable": []}}, {"delivery_value": "*", "origin": ["same-https", "same-http", "cross-https", "cross-http"], "delivery_type": "*", "name": "Skip-origins-not-applicable-to-websockets", "expectation": "*", "expansion": "*", "redirection": "*", "source_context_list": "*", "source_scheme": "*", "subresource": {"blockable": ["websocket"], "optionally-blockable": []}}, {"delivery_value": "opt-in", "origin": "*", "delivery_type": "meta", "name": "Skip-redundant-for-opt-in-method", "expectation": "*", "expansion": "*", "redirection": ["keep-scheme", "swap-scheme"], "source_context_list": "*", "source_scheme": "*", "subresource": {"blockable": "*", "optionally-blockable": "*"}}], "specification": [{"test_expansion": [{"delivery_value": "opt-in", "origin": ["cross-http", "same-http"], "delivery_type": "*", "name": "opt-in-blocks", "expectation": "blocked", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": {"blockable": [], "optionally-blockable": "*"}}, {"delivery_value": null, "origin": ["cross-http", "same-http"], "delivery_type": "*", "name": "no-opt-in-allows", "expectation": "allowed", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": {"blockable": [], "optionally-blockable": "*"}}], "description": "Test behavior of optionally-blockable content", "specification_url": "http://www.w3.org/TR/mixed-content/#category-optionally-blockable", "name": "optionally-blockable", "title": "Optionally-blockable content"}, {"test_expansion": [{"delivery_value": "opt-in", "origin": ["cross-http", "same-http"], "delivery_type": "*", "name": "opt-in-blocks", "expectation": "blocked", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": {"blockable": "*", "optionally-blockable": []}}, {"delivery_value": null, "origin": ["cross-http", "same-http"], "delivery_type": "*", "name": "no-opt-in-blocks", "expectation": "blocked", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": {"blockable": "*", "optionally-blockable": []}}, {"delivery_value": "*", "origin": ["cross-ws", "same-ws"], "delivery_type": "*", "name": "ws-downgrade-blocks", "expectation": "blocked", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": {"blockable": "websocket", "optionally-blockable": []}}], "description": "Test behavior of blockable content.", "specification_url": "http://www.w3.org/TR/mixed-content/#category-blockable", "name": "blockable", "title": "Blockable content"}, {"test_expansion": [{"delivery_value": "*", "origin": ["same-https"], "delivery_type": "*", "name": "allowed", "expectation": "allowed", "expansion": "default", "redirection": ["no-redirect", "keep-scheme"], "source_context_list": "*", "source_scheme": "https", "subresource": {"blockable": "*", "optionally-blockable": "*"}}, {"delivery_value": "*", "origin": ["same-wss"], "delivery_type": "*", "name": "websocket-allowed", "expectation": "allowed", "expansion": "default", "redirection": ["no-redirect", "keep-scheme"], "source_context_list": "*", "source_scheme": "https", "subresource": {"blockable": "websocket", "optionally-blockable": []}}], "description": "Test behavior of allowed content.", "specification_url": "http://www.w3.org/TR/mixed-content/", "name": "allowed", "title": "Allowed content"}], "test_expansion_schema": {"delivery_value": [null, "opt-in"], "origin": ["same-https", "same-http", "cross-https", "cross-http", "same-wss", "same-ws", "cross-wss", "cross-ws"], "delivery_type": ["http-rp", "meta"], "subresource": {"blockable": ["script-tag", "link-css-tag", "xhr", "worker-classic", "worker-module", "worker-import-data", "worklet-animation", "worklet-audio", "worklet-layout", "worklet-paint", "worklet-animation-import-data", "worklet-audio-import-data", "worklet-layout-import-data", "worklet-paint-import-data", "fetch", "a-tag", "object-tag", "picture-tag", "websocket", "link-prefetch-tag", "beacon"], "optionally-blockable": ["img-tag", "audio-tag", "video-tag"]}, "expectation": ["allowed", "blocked"], "expansion": ["default", "override"], "redirection": ["no-redirect", "keep-scheme", "swap-scheme"], "source_context_list": ["top", "worker-classic-data", "worker-module-data"], "source_scheme": ["http", "https"]}, "source_context_list_schema": {"worker-classic-data": {"subresourcePolicyDeliveries": [], "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "worker-classic-data", "policyDeliveries": []}]}, "top": {"subresourcePolicyDeliveries": [], "description": "Policy set by the top-level Document", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}]}, "worker-module-data": {"subresourcePolicyDeliveries": [], "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "worker-module-data", "policyDeliveries": []}]}}, "delivery_key": "mixedContent", "source_context_schema": {"supported_delivery_type": {"iframe": ["http-rp", "meta"], "worker-module-data": [], "worker-classic-data": [], "top": ["http-rp", "meta"], "worker-classic": ["http-rp"], "worker-module": ["http-rp"], "srcdoc": ["meta"]}, "supported_subresource": {"iframe": "*", "worker-module-data": ["xhr", "fetch", "websocket"], "worker-classic-data": ["xhr", "fetch", "websocket"], "top": "*", "worker-classic": ["xhr", "fetch", "websocket"], "worker-module": ["xhr", "fetch", "websocket"], "srcdoc": "*"}}};
diff --git a/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_coalesced_events_attributes-manual.html b/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_coalesced_events_attributes-manual.html
deleted file mode 100644
index 89149468a5d..00000000000
--- a/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_coalesced_events_attributes-manual.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <title>Pointer Events coalesced events count and properties<</title>
-        <meta name="viewport" content="width=device-width">
-        <link rel="stylesheet" type="text/css" href="../pointerevent_styles.css">
-        <script src="/resources/testharness.js"></script>
-        <script src="/resources/testharnessreport.js"></script>
-        <!-- Additional helper script for common checks across event types -->
-        <script type="text/javascript" src="../pointerevent_support.js"></script>
-        <script>
-            var eventList = All_Pointer_Events;
-            PhaseEnum = {
-              WaitingForCancel:   0,
-              WaitingForOver:     1,
-              WaitingForEnter:    2,
-              WaitingForDown:     3,
-              WaitingForMove:     4,
-              WaitingForUp:       5,
-              WaitingForOut:      6,
-              WaitingForLeave:    7,
-              Done:               8,
-            };
-            var phase = PhaseEnum.WaitingForCancel;
-
-            function resetTestState() {
-                phase = PhaseEnum.WaitingForCancel;
-            }
-            function expect_no_coalesced_events(event, eventName) {
-                test(function () {
-                    assert_equals(event.getCoalescedEvents().length, 0, eventName + ' should not have any coalesced events');
-                }, expectedPointerType + ' ' + eventName + ' should not have any coalesced events'); 
-            }
-            function run() {
-                var test_pointerEvent = setup_pointerevent_test("coalesced events attributes in pointerevents", ['touch']);
-                var target0 = document.getElementById("target0");
-                var target1 = document.getElementById("target1");
-
-                on_event(target0, 'pointercancel', function (event) {
-                    if (phase == PhaseEnum.WaitingForCancel) {
-                        expect_no_coalesced_events(event, 'pointercancel');
-                        phase++;
-                    }
-                });
-                eventList.forEach(function(eventName) {
-                    on_event(target1, eventName, function (event) {
-                        switch (phase) {
-                          case PhaseEnum.WaitingForOver:
-                            if (eventName == 'pointerover') {
-                              expect_no_coalesced_events(event, eventName);
-                              phase++;
-                            }
-                            break;
-                          case PhaseEnum.WaitingForEnter:
-                            if (eventName == 'pointerenter') {
-                              expect_no_coalesced_events(event, eventName);
-                              phase++;
-                            }
-                            break;
-                          case PhaseEnum.WaitingForDown:
-                            if (eventName == 'pointerdown') {
-                              expect_no_coalesced_events(event, eventName);
-                              phase++;
-                              setTimeout(function(){
-                                // This is just a way to block the main thread.
-                                var current = new Date().getTime();
-                                for (; new Date().getTime() - current < 500;);
-                              }, 0);
-                            }
-                            break;
-                          case PhaseEnum.WaitingForMove:
-                            if (eventName == 'pointermove') {
-                              var coalescedEvents = event.getCoalescedEvents();
-                              test (function() {
-                                assert_greater_than(event.getCoalescedEvents().length, 1, 'pointermove should have at least 2 coalesced events.');
-                              }, expectedPointerType + ' pointermove should have >2 coalesced events as main thread is busy.');
-                              test (function() {
-                                for (var i=0; i<coalescedEvents.length; i++) {
-                                  assert_equals(coalescedEvents[i].isTrusted, true, 'isTrusted flag should be true for coalesced events.');
-                                  if (i > 0)
-                                    assert_greater_than_equal(coalescedEvents[i].timeStamp, coalescedEvents[i-1].timeStamp, 'Time stamps of coalesced events must be ascending.');
-                                }
-                              }, expectedPointerType + ' pointermove coalesced events should all be marked as trusted.');
-                              test (function() {
-                                for (var i=1; i<coalescedEvents.length; i++)
-                                  assert_greater_than_equal(coalescedEvents[i].timeStamp, coalescedEvents[i-1].timeStamp, 'Time stamps of coalesced events must be ascending.');
-                              }, expectedPointerType + ' time stamps of coalesced events must be ascending.');
-                              test (function() {
-                                for (var i=0; i<coalescedEvents.length; i++) {
-                                  assert_equals(coalescedEvents[i].bubbles, false, 'Bubbles attribute should be false for coalesced events.');
-                                  assert_equals(coalescedEvents[i].cancelable, false, 'Cancelable attribute should be false for coalesced events.');
-                                }
-                              }, expectedPointerType + ' pointermove coalesced events should all bubbles and cancelable as false.');
-                              phase++;
-                            }
-                            break;
-                          case PhaseEnum.WaitingForUp:
-                            if (eventName == 'pointerup') {
-                              expect_no_coalesced_events(event, eventName);
-                              phase++;
-                            }
-                            break;
-                          case PhaseEnum.WaitingForOut:
-                            if (eventName == 'pointerout') {
-                              expect_no_coalesced_events(event, eventName);
-                              phase++;
-                            }
-                            break;
-                          case PhaseEnum.WaitingForLeave:
-                            if (eventName == 'pointerleave') {
-                              expect_no_coalesced_events(event, eventName);
-                              phase++;
-                              test_pointerEvent.done();
-                            }
-                            break;
-                        }
-                    });
-                });
-            }
-        </script>
-    </head>
-    <body onload="run()">
-        <h1>Pointer Events coalesced events count and properties</h1>
-        <h2 id="pointerTypeDescription"></h2>
-        <h4>
-            Test Description: This test checks the coalesced events of all types of pointer events.
-            <ol>
-                 <li>Pointer down in the black square and drag inside the black square immediately</li>
-                 <li>Release the pointer.</li>
-                 <li>Pointer down in the purple square and drag inside the purple square immediately</li>
-                 <li>Release the pointer and move out of the purple square</li>
-            </ol>
-
-            Test passes if the proper behavior of the events is observed.
-        </h4>
-        <div id="target0"></div>
-        <div id="target1" class="touchActionNone"></div>
-        <div id="complete-notice">
-            <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
-            <p>Refresh the page to run the tests again with a different pointer type.</p>
-        </div>
-    </body>
-</html>
-
diff --git a/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_coalesced_events_attributes.html b/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_coalesced_events_attributes.html
new file mode 100644
index 00000000000..fa68124c829
--- /dev/null
+++ b/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_coalesced_events_attributes.html
@@ -0,0 +1,192 @@
+<!doctype html>
+<html>
+    <head>
+        <title>Pointer Events coalesced events count and properties<</title>
+        <meta name="viewport" content="width=device-width">
+        <link rel="stylesheet" type="text/css" href="../pointerevent_styles.css">
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="/resources/testdriver.js"></script>
+        <script src="/resources/testdriver-actions.js"></script>
+        <script src="/resources/testdriver-vendor.js"></script>
+        <!-- Additional helper script for common checks across event types -->
+        <script type="text/javascript" src="../pointerevent_support.js"></script>
+        <script>
+            var eventList = All_Pointer_Events;
+            PhaseEnum = {
+              WaitingForCancel:   0,
+              WaitingForOver:     1,
+              WaitingForEnter:    2,
+              WaitingForDown:     3,
+              WaitingForMove:     4,
+              WaitingForUp:       5,
+              WaitingForOut:      6,
+              WaitingForLeave:    7,
+              Done:               8,
+            };
+            var phase = PhaseEnum.WaitingForCancel;
+
+            function resetTestState() {
+                phase = PhaseEnum.WaitingForCancel;
+            }
+            function expect_no_coalesced_events(event, eventName) {
+                test(function () {
+                    assert_equals(event.getCoalescedEvents().length, 0, eventName + ' should not have any coalesced events');
+                }, expectedPointerType + ' ' + eventName + ' should not have any coalesced events');
+            }
+            function getInViewPoint(element) {
+                var rectangles = element.getClientRects();
+                if (rectangles.length === 0) {
+                  return false;
+                }
+
+                var rect = rectangles[0];
+                var left = Math.max(0, rect.left);
+                var right = Math.min(window.innerWidth, rect.right);
+                var top = Math.max(0, rect.top);
+                var bottom = Math.min(window.innerHeight, rect.bottom);
+
+                var x = parseInt(0.5 * (left + right));
+                var y = parseInt(0.5 * (top + bottom));
+
+                return [x, y];
+            }
+            function run() {
+                var test_pointerEvent = setup_pointerevent_test("coalesced events attributes in pointerevents", ['touch']);
+                var target0 = document.getElementById("target0");
+                var target1 = document.getElementById("target1");
+                var actions_promise;
+
+                on_event(target0, 'pointercancel', function (event) {
+                    if (phase == PhaseEnum.WaitingForCancel) {
+                        expect_no_coalesced_events(event, 'pointercancel');
+                        phase++;
+                    }
+                });
+                eventList.forEach(function(eventName) {
+                    on_event(target1, eventName, function (event) {
+                        switch (phase) {
+                          case PhaseEnum.WaitingForOver:
+                            if (eventName == 'pointerover') {
+                              expect_no_coalesced_events(event, eventName);
+                              phase++;
+                            }
+                            break;
+                          case PhaseEnum.WaitingForEnter:
+                            if (eventName == 'pointerenter') {
+                              expect_no_coalesced_events(event, eventName);
+                              phase++;
+                            }
+                            break;
+                          case PhaseEnum.WaitingForDown:
+                            if (eventName == 'pointerdown') {
+                              expect_no_coalesced_events(event, eventName);
+                              phase++;
+                              step_timeout(function(){
+                                // This is just a way to block the main thread.
+                                var current = new Date().getTime();
+                                for (; new Date().getTime() - current < 500;);
+                              }, 0);
+                            }
+                            break;
+                          case PhaseEnum.WaitingForMove:
+                            if (eventName == 'pointermove') {
+                              var coalescedEvents = event.getCoalescedEvents();
+                              test (function() {
+                                assert_greater_than(event.getCoalescedEvents().length, 1, 'pointermove should have at least 2 coalesced events.');
+                              }, expectedPointerType + ' pointermove should have >2 coalesced events as main thread is busy.');
+                              test (function() {
+                                for (var i=0; i<coalescedEvents.length; i++) {
+                                  assert_equals(coalescedEvents[i].isTrusted, true, 'isTrusted flag should be true for coalesced events.');
+                                  if (i > 0)
+                                    assert_greater_than_equal(coalescedEvents[i].timeStamp, coalescedEvents[i-1].timeStamp, 'Time stamps of coalesced events must be ascending.');
+                                }
+                              }, expectedPointerType + ' pointermove coalesced events should all be marked as trusted.');
+                              test (function() {
+                                for (var i=1; i<coalescedEvents.length; i++)
+                                  assert_greater_than_equal(coalescedEvents[i].timeStamp, coalescedEvents[i-1].timeStamp, 'Time stamps of coalesced events must be ascending.');
+                              }, expectedPointerType + ' time stamps of coalesced events must be ascending.');
+                              test (function() {
+                                for (var i=0; i<coalescedEvents.length; i++) {
+                                  assert_equals(coalescedEvents[i].bubbles, false, 'Bubbles attribute should be false for coalesced events.');
+                                  assert_equals(coalescedEvents[i].cancelable, false, 'Cancelable attribute should be false for coalesced events.');
+                                }
+                              }, expectedPointerType + ' pointermove coalesced events should all bubbles and cancelable as false.');
+                              phase++;
+                            }
+                            break;
+                          case PhaseEnum.WaitingForUp:
+                            if (eventName == 'pointerup') {
+                              expect_no_coalesced_events(event, eventName);
+                              phase++;
+                            }
+                            break;
+                          case PhaseEnum.WaitingForOut:
+                            if (eventName == 'pointerout') {
+                              expect_no_coalesced_events(event, eventName);
+                              phase++;
+                            }
+                            break;
+                          case PhaseEnum.WaitingForLeave:
+                            if (eventName == 'pointerleave') {
+                              expect_no_coalesced_events(event, eventName);
+                              phase++;
+                              actions_promise.then( () => {
+                                test_pointerEvent.done();
+                              });
+                            }
+                            break;
+                        }
+                    });
+                });
+
+                // Inject touch inputs.
+                var elementPoint1 = getInViewPoint(target0);
+                var x1 = elementPoint1[0];
+                var y1 = elementPoint1[1];
+                var elementPoint2 = getInViewPoint(target1);
+                var x2 = elementPoint2[0];
+                var y2 = elementPoint2[1];
+                actions_promise = new test_driver.Actions(0)
+                   .addPointer("touchPointer1", "touch")
+                   .pointerMove(x1, y1)
+                   .pointerDown()
+                   .pointerMove(x1 + 10, y1)
+                   .pointerMove(x1 + 20, y1)
+                   .pointerMove(x1 + 30, y1)
+                   .addTick(20)
+                   .pointerUp()
+                   .pointerMove(x2, y2)
+                   .pointerDown()
+                   .pointerMove(x2 + 10, y2)
+                   .pointerMove(x2 + 20, y2)
+                   .pointerMove(x2 + 30, y2)
+                   .addTick(20)
+                   .pointerUp()
+                   .send();
+             }
+        </script>
+    </head>
+    <body onload="run()">
+        <h1>Pointer Events coalesced events count and properties</h1>
+        <h2 id="pointerTypeDescription"></h2>
+        <h4>
+            Test Description: This test checks the coalesced events of all types of pointer events.
+            <ol>
+                 <li>Pointer down in the black square and drag inside the black square immediately</li>
+                 <li>Release the pointer.</li>
+                 <li>Pointer down in the purple square and drag inside the purple square immediately</li>
+                 <li>Release the pointer and move out of the purple square</li>
+            </ol>
+
+            Test passes if the proper behavior of the events is observed.
+        </h4>
+        <div id="target0"></div>
+        <div id="target1" class="touchActionNone"></div>
+        <div id="complete-notice">
+            <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
+            <p>Refresh the page to run the tests again with a different pointer type.</p>
+        </div>
+    </body>
+</html>
+
diff --git a/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_pointerrawupdate.html b/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_pointerrawupdate.html
index 0d317010621..0f46583c9b5 100644
--- a/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_pointerrawupdate.html
+++ b/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_pointerrawupdate.html
@@ -20,6 +20,7 @@
         <div id="target0"></div>
         <script>
             var test_pointerrawupdate = async_test("pointerrawupdate event received");
+            var actions_promise;
 
             var pointerrawupdateReceived = false;
             var pointerdownReceived = false;
@@ -47,10 +48,13 @@
                         assert_true(pointerrawupdateFromButtonChangeReceived,
                                     "Pointerrawupdate event should have been received from chorded button changes.");
                         }, "Pointerrawupdate event should have been received from chorded button changes.");
-                    test_pointerrawupdate.done();
+                    // Make sure the test finishes after all the input actions are completed.
+                    actions_promise.then( () => {
+                        test_pointerrawupdate.done();
+                    });
                 });
                 var actions = new test_driver.Actions();
-                actions.pointerMove(0, 0, {origin: target0, button: actions.ButtonType.LEFT})
+                actions_promise = actions.pointerMove(0, 0, {origin: target0, button: actions.ButtonType.LEFT})
                     .pointerDown({button: actions.ButtonType.LEFT})
                     .pointerDown({button: actions.ButtonType.MIDDLE})
                     .pointerUp({button: actions.ButtonType.MIDDLE})
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointercancel_touch.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointercancel_touch.html
index a645033a247..b09ddd740a6 100644
--- a/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointercancel_touch.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointercancel_touch.html
@@ -31,10 +31,10 @@
 
             var pointerdown_event = null;
             var pointercancel_event = null;
-            var received_pointerleave = false;
 
             function run() {
                 var target0 = document.getElementById("target0");
+                var actions_promise;
 
                 on_event(target0, "pointerdown", function (event) {
                     pointerdown_event = event;
@@ -68,16 +68,14 @@
                         assert_equals(event.pointerType, pointerdown_event.pointerType, "pointerType should be the same for pointerleave and pointercancel");
                         assert_equals(event.isPrimary, pointerdown_event.isPrimary, "isPrimary should be the same for pointerleave and pointercancel");
                     });
-                    received_pointerleave = true;
-                });
-
-                // Inject touch inputs and wait for all the actions finish to end the test.
-                touchScrollInTarget(target0, 'down').then(function() {
-                    test_pointerEvent.step(function () {
-                        assert_true(received_pointerleave, "pointerleave should be received before the test finished");
+                    // Make sure the test finishes after all the input actions are completed.
+                    actions_promise.then( () => {
+                        test_pointerEvent.done();
                     });
-                    test_pointerEvent.done();
                 });
+
+                // Inject touch inputs.
+                actions_promise = touchScrollInTarget(target0, 'down');
             }
         </script>
         <h1>Pointer Events pointercancel Tests</h1>
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointerleave_after_pointercancel_touch.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointerleave_after_pointercancel_touch.html
index 555e5feb010..8425667a104 100644
--- a/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointerleave_after_pointercancel_touch.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointerleave_after_pointercancel_touch.html
@@ -24,12 +24,12 @@
             // will fail unless the async_test is created with the var name "test_pointerEvent".
             add_completion_callback(showPointerTypes);
 
-            var eventTested = false;
             var pointercancel_event = null;
             var detected_pointertypes = {};
 
             function run() {
                 var target0 = document.getElementById("target0");
+                var actions_promise;
 
                 on_event(target0, "pointercancel", function (event) {
                     detected_pointertypes[event.pointerType] = true;
@@ -41,13 +41,14 @@
                 on_event(target0, "pointerleave", function (event) {
                     if(event.pointerType == 'touch') {
                         if(pointercancel_event != null) {
-                            if(eventTested == false) {
-                                test_pointerleave.step(function() {
-                                    assert_equals(event.pointerType, pointercancel_event.pointerType, "pointerType is same for pointercancel and pointerleave");
-                                    assert_equals(event.isPrimary, pointercancel_event.isPrimary, "isPrimary is same for pointercancel and pointerleave");
-                                });
-                                eventTested = true;
-                            }
+                            test_pointerleave.step(function() {
+                                assert_equals(event.pointerType, pointercancel_event.pointerType, "pointerType is same for pointercancel and pointerleave");
+                                assert_equals(event.isPrimary, pointercancel_event.isPrimary, "isPrimary is same for pointercancel and pointerleave");
+                            });
+                            // Make sure the test finishes after all the input actions are completed.
+                            actions_promise.then( () => {
+                                test_pointerleave.done();
+                            });
                         }
                         else {
                             test_pointerleave.step(function() {
@@ -57,13 +58,8 @@
                     }
                 });
 
-                // Inject touch inputs and wait for all the actions finish to end the test.
-                touchScrollInTarget(target0, 'down').then(function() {
-                    test_pointerleave.step(function () {
-                        assert_true(eventTested, "pointerleave should be received before the test finishes");
-                    }, "pointerleave should be received before the test finishes");
-                    test_pointerleave.done();
-                });
+                // Inject touch inputs.
+                actions_promise = touchScrollInTarget(target0, 'down');
             }
 
         </script>
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointerout_after_pointercancel_touch.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointerout_after_pointercancel_touch.html
index 13e7ffaebc1..782289384ab 100644
--- a/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointerout_after_pointercancel_touch.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointerout_after_pointercancel_touch.html
@@ -24,12 +24,12 @@
             // will fail unless the async_test is created with the var name "test_pointerEvent".
             add_completion_callback(showPointerTypes);
 
-            var eventTested = false;
             var pointercancel_event = null;
             var detected_pointertypes = {};
 
             function run() {
                 var target0 = document.getElementById("target0");
+                var actions_promise;
 
                 on_event(target0, "pointercancel", function (event) {
                     detected_pointertypes[event.pointerType] = true;
@@ -41,13 +41,14 @@
                 on_event(target0, "pointerout", function (event) {
                     if(event.pointerType == 'touch') {
                         if(pointercancel_event != null) {
-                            if (eventTested == false) {
-                                test_pointerout.step(function() {
-                                    assert_equals(event.pointerType, pointercancel_event.pointerType, "pointerType is same for pointercancel and pointerout");
-                                    assert_equals(event.isPrimary, pointercancel_event.isPrimary, "isPrimary is same for pointercancel and pointerout");
-                                });
-                                eventTested = true;
-                            }
+                            test_pointerout.step(function() {
+                                assert_equals(event.pointerType, pointercancel_event.pointerType, "pointerType is same for pointercancel and pointerout");
+                                assert_equals(event.isPrimary, pointercancel_event.isPrimary, "isPrimary is same for pointercancel and pointerout");
+                            });
+                            // Make sure the test finishes after all the input actions are completed.
+                            actions_promise.then( () => {
+                                test_pointerout.done();
+                            });
                         }
                         else {
                             test_pointerout.step(function() {
@@ -58,13 +59,8 @@
                     }
                 });
 
-                // Inject touch inputs and wait for all the actions finish to end the test.
-                touchScrollInTarget(target0, 'down').then(function() {
-                    test_pointerout.step(function () {
-                        assert_true(eventTested, "pointerout should be received before the test finishes");
-                    }, "pointerout should be received before the test finishes");
-                    test_pointerout.done();
-                });
+                // Inject touch inputs.
+                actions_promise = touchScrollInTarget(target0, 'down');
             }
 
         </script>
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_releasepointercapture_events_to_original_target.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_releasepointercapture_events_to_original_target.html
index 12e31cdb234..6f6d30e16e1 100644
--- a/tests/wpt/web-platform-tests/pointerevents/pointerevent_releasepointercapture_events_to_original_target.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_releasepointercapture_events_to_original_target.html
@@ -22,6 +22,8 @@
             var outLeaveEventsFail = false;
             var f_gotPointerCapture = false;
             var f_lostPointerCapture = false;
+            var index = 0;
+            var actions_promise;
 
             function resetTestState() {
               captured_event = null;
@@ -98,7 +100,16 @@
                     });
                     if (event.type == "pointerup") {
                         test_done = true;
-                        test_pointerEvent.done(); // complete test
+                        // Make sure the test finishes after all the input actions are completed.
+                        actions_promise.then( () => {
+                            if (index == 0) {
+                                actions_promise =  pointerDragInTarget('touch', target0, 'right');
+                            } else if (index == 1) {
+                                actions_promise =  pointerDragInTarget('pen', target0, 'right');
+                            }
+                            index++;
+                            test_pointerEvent.done();
+                        });
                     }
                 }
             }
@@ -116,11 +127,7 @@
                 }
 
                 // Inject pointer inputs.
-                pointerDragInTarget('mouse', target0, 'right').then(function() {
-                    return pointerDragInTarget('touch', target0, 'right');
-                }).then(function() {
-                    return pointerDragInTarget('pen', target0, 'right');
-                });
+                actions_promise = pointerDragInTarget('mouse', target0, 'right');
             }
         </script>
     </head>
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_releasepointercapture_onpointercancel_touch.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_releasepointercapture_onpointercancel_touch.html
index 493236150dd..c54ee2a9d4e 100644
--- a/tests/wpt/web-platform-tests/pointerevents/pointerevent_releasepointercapture_onpointercancel_touch.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_releasepointercapture_onpointercancel_touch.html
@@ -25,13 +25,13 @@
 
         <script type='text/javascript'>
             var pointercancelGot = false;
-            var lostpointercaptureGot = false;
             var count=0;
             var event_log = [];
             var detected_pointertypes = {};
             var test_pointerEvent = async_test("pointer capture is released on pointercancel");
 
             var target0 = document.getElementById('target0');
+            var actions_promise;
 
             add_completion_callback(end_of_test);
             function end_of_test() {
@@ -61,7 +61,10 @@
                     test_pointerEvent.step(function () {
                         assert_true(pointercancelGot, "pointercancel was received before lostpointercapture");
                     });
-                    lostpointercaptureGot = true;
+                    // Make sure the test finishes after all the input actions are completed.
+                    actions_promise.then( () => {
+                        test_pointerEvent.done();
+                    });
                 });
 
                 on_event(target0, 'pointercancel', function(e) {
@@ -69,13 +72,8 @@
                     pointercancelGot = true;
                 });
 
-                // Inject touch inputs and wait for all the actions finish to end the test.
-                touchScrollInTarget(target0, 'down').then(function() {
-                    test_pointerEvent.step(function () {
-                        assert_true(lostpointercaptureGot, "lostpointercapture should be received before the test finishes");
-                    }, "lostpointercapture should be received before the test finishes");
-                    test_pointerEvent.done();
-                });
+                // Inject touch inputs.
+                actions_promise = touchScrollInTarget(target0, 'down');
             }
         </script>
         <h1>Pointer Events Capture Test</h1>
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_sequence_at_implicit_release_on_click.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_sequence_at_implicit_release_on_click.html
index 0c6e2c532f9..4b424f27643 100644
--- a/tests/wpt/web-platform-tests/pointerevents/pointerevent_sequence_at_implicit_release_on_click.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_sequence_at_implicit_release_on_click.html
@@ -16,6 +16,8 @@
       var detected_pointertypes = {};
       var event_log = [];
       var start_logging = false;
+      var actions_promise;
+      var index = 0;
 
       function resetTestState() {
         detected_eventTypes = {};
@@ -31,7 +33,20 @@
             var expected_events = "pointerup, lostpointercapture, pointerout, pointerleave";
             assert_equals(event_log.join(", "), expected_events);
           });
-          test_pointer_event.done();
+          // Make sure the test finishes after all the input actions are completed.
+          actions_promise.then( () => {
+            if (index == 0) {
+              actions_promise = clickInTarget("touch", target).then(function() {
+                return clickInTarget("touch", button);
+              });
+            } else if (index == 1) {
+              actions_promise = clickInTarget("pen", target).then(function() {
+                return clickInTarget("pen", button);
+              });
+            }
+            index++;
+            test_pointer_event.done();
+          });
         });
 
         var target = document.getElementById("target");
@@ -54,16 +69,8 @@
         });
 
         // Inject pointer inputs.
-        clickInTarget("mouse", target).then(function() {
+        actions_promise = clickInTarget("mouse", target).then(function() {
           return clickInTarget("mouse", button);
-        }).then(function() {
-          return clickInTarget("touch", target);
-        }).then(function() {
-          return clickInTarget("touch", button);
-        }).then(function() {
-          return clickInTarget("pen", target);
-        }).then(function() {
-          return clickInTarget("pen", button);
         });
       }
     </script>
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_setpointercapture_inactive_button_mouse.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_setpointercapture_inactive_button_mouse.html
index 7d0b00d47bc..fa9a5fb3c5b 100644
--- a/tests/wpt/web-platform-tests/pointerevents/pointerevent_setpointercapture_inactive_button_mouse.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_setpointercapture_inactive_button_mouse.html
@@ -32,16 +32,19 @@
 
             function run() {
                 var target0 = document.getElementById("target0");
+                var actions_promise;
 
                 on_event(target0, "pointerover", function (event) {
                     detected_pointertypes[event.pointerType] = true;
                     target0.setPointerCapture(event.pointerId);
                     // After we receive a pointerover event, dispatch a pointer move to move out of target0.
-                    new test_driver.Actions().pointerMove(0, 0).send();
+                    actions_promise.then(function() {
+                        return new test_driver.Actions().pointerMove(0, 0).send();
+                    });
                 });
 
                 // First dispatch a pointer move to target0.
-                new test_driver.Actions().pointerMove(0, 0, {origin: target0}).send();
+                actions_promise = new test_driver.Actions().pointerMove(0, 0, {origin: target0}).send();
 
                  // When the setPointerCapture method is invoked, if the specified pointer is not in active button state, then the method must have no effect on subsequent pointer events.
                  // TA: 13.2
@@ -49,7 +52,10 @@
                     test(function() {
                         assert_false(captureGot, "pointer capture is not set while button state is inactive")
                     }, "pointer capture is not set while button state is inactive");
-                    done();
+                    // Make sure the test finishes after all the input actions are completed.
+                    actions_promise.then( () => {
+                        done();
+                    });
                 });
 
                 on_event(target0, 'gotpointercapture', function(e) {
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_suppress_compat_events_on_click.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_suppress_compat_events_on_click.html
index 341a82d97a8..2f99e7a976a 100644
--- a/tests/wpt/web-platform-tests/pointerevents/pointerevent_suppress_compat_events_on_click.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_suppress_compat_events_on_click.html
@@ -15,6 +15,7 @@
     <script type="text/javascript">
       var test_pointerEvent = async_test("Suppress compat mouse events on click");
       add_completion_callback(end_of_test);
+      var actions_promise;
 
       var detected_pointertypes = {};
       var event_log = [];
@@ -30,11 +31,15 @@
                   "click@target0, mousedown@target1, mouseup@target1, click@target1");
           }, "Event log");
 
-          test_pointerEvent.done(); // complete test
+          // Make sure the test finishes after all the input actions are completed.
+          actions_promise.then( () => {
+              test_pointerEvent.done();
+          });
       }
 
       function run() {
-          on_event(document.getElementById("done"), "click", end_of_interaction);
+          var targetDone = document.getElementById('done');
+          on_event(targetDone, "click", end_of_interaction);
 
           var target_list = ["target0", "target1"];
           var pointer_event_list = ["pointerdown"];
@@ -65,10 +70,7 @@
           });
 
           // Inject mouse inputs.
-          var target0 = document.getElementById('target0');
-          var target1 = document.getElementById('target1');
-          var targetDone = document.getElementById('done');
-          new test_driver.Actions()
+          actions_promise = new test_driver.Actions()
               .pointerMove(0, 0, {origin: target0})
               .pointerDown()
               .pointerUp()
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_suppress_compat_events_on_drag_mouse.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_suppress_compat_events_on_drag_mouse.html
index 6ed75ab4cbc..6ed19c24678 100644
--- a/tests/wpt/web-platform-tests/pointerevents/pointerevent_suppress_compat_events_on_drag_mouse.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_suppress_compat_events_on_drag_mouse.html
@@ -15,6 +15,7 @@
     <script type="text/javascript">
       var test_pointerEvent = async_test("Suppress compat mouse events on drag");
       add_completion_callback(end_of_test);
+      var actions_promise;
 
       var detected_pointertypes = {};
       var event_log = [];
@@ -37,11 +38,15 @@
                   "mousedown@target1, mousemove@target1, mouseup@target1");
           }, "Event log");
 
-          test_pointerEvent.done(); // complete test
+          // Make sure the test finishes after all the input actions are completed.
+          actions_promise.then( () => {
+              test_pointerEvent.done();
+          });
       }
 
       function run() {
-          on_event(document.getElementById("done"), "click", end_of_interaction);
+          var targetDone = document.getElementById('done');
+          on_event(targetDone, "click", end_of_interaction);
 
           var target_list = ["target0", "target1"];
           var pointer_event_list = ["pointerdown" , "pointermove", "pointerup"];
@@ -79,10 +84,7 @@
           });
 
           // Inject mouse inputs.
-          var target0 = document.getElementById('target0');
-          var target1 = document.getElementById('target1');
-          var targetDone = document.getElementById('done');
-          new test_driver.Actions()
+          actions_promise = new test_driver.Actions()
               .pointerMove(0, 0, {origin: target0})
               .pointerDown()
               .pointerMove(10, 0, {origin: target0})
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-y_touch.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-y_touch.html
index 704b4188979..99677313de5 100644
--- a/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-y_touch.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-y_touch.html
@@ -92,7 +92,7 @@
             function run() {
                 var target0 = document.getElementById("target0");
                 var btnComplete = document.getElementById("btnComplete");
-                var clickIsReceived = false;
+                var actions_promise;
 
                 // Check if touch-action attribute works properly for embedded divs
                 // Scrollable-Parent, Child: `pan-x`, Grand-Child: `pan-y`
@@ -103,7 +103,10 @@
                         assert_equals(target0.scrollLeft, 0, "scroll x offset should be 0 in the end of the test");
                         assert_equals(target0.scrollTop, 0, "scroll y offset should be 0 in the end of the test");
                     });
-                    clickIsReceived = true;
+                    // Make sure the test finishes after all the input actions are completed.
+                    actions_promise.then( () => {
+                        test_touchaction.done();
+                    });
                     updateDescriptionComplete();
                 });
 
@@ -112,15 +115,10 @@
                 });
 
                 // Inject touch inputs.
-                touchScrollInTarget(scrollTarget, 'down').then(function() {
+                actions_promise = touchScrollInTarget(scrollTarget, 'down').then(function() {
                     return touchScrollInTarget(scrollTarget, 'right');
                 }).then(function() {
                     return clickInTarget("touch", btnComplete);
-                }).then(function() {
-                    test_touchaction.step(function () {
-                        assert_true(clickIsReceived, "click should be received before the test finishes");
-                    }, "click should be received before the test finishes");
-                    test_touchaction.done();
                 });
             }
         </script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..3d09f39410b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..9c7a9245ae8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..4be57de2755
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..6f4cebe3ee7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..2dc8bbae43b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..fca7e959656
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..a7abfde5e55
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..414983622a1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..4e534a9c753
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..af8dba9f66f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..131dc9a4c0b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..48eee6b1da7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..724c507b481
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..6f86a5bd304
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..4933e9c413e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..cf55249cd7d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..c5233ad7fda
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..53098fb5eef
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..4e8d4a9c9c3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..e03ea85dfb9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..2e7836a1b2f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..4e91d52fd05
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..1943c0909bf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..489c3e799b7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..65eba084020
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..37f4e008b35
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..369c8a5c0b2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..d2a864a064f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..d6459820a28
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..ecbf180b4c2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..9a4124ccb67
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..40104428e2e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..b885d9457bc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..8cac3b45fb5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..500f3f39a95
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..0c6e5e90a6c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..79b4f65accf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..df734f1e60c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..70fd1c97d13
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..82b9c0f3310
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..001ad080c57
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..4bf38ace3e1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..2e72613575a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..597c2f6c778
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..038d63c730e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..f4c5190091e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..c6a4a9508de
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..9880f160057
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..656cf35626b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..9639c199a56
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..5dd7ddacfc1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..26bf3130322
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..f9fd0b0b036
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..818b0816c24
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..166d53adff3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..d91a2e81636
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..ba587f84dbf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..f386befc6eb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..27d8de6246d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..b914efdc87c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..bfd6f1c3f47
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..0e9935af62a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..5d7e1268e19
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..11a717d4725
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..8b36d15a3fd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..f1158b0cf48
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..da39661bcbf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..d9fe8e19770
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..26154b93ecf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..eea93a2d5c2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..129d0344bd8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..df2cec8fc86
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..91e9d03c545
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..5820a30aa69
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..008db741e3b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..6512f2a1ec3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..773b18c0a5a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..073133aaa2b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..121c4e97b67
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..c5869dc778c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..85fc13eab52
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..bd74c1f3600
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..8816e074d98
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..b24b847bd60
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..7e30815d9b6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..b44447b143e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..2fb45874a1a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..8a075efa087
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..a2108d0858d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..ba8e55344ab
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..b1aec995339
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..b8676f6fcb2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..c4d1fec0f76
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..48ae72274dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..3b5c6087ca7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..777b6de1ef0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..ddb55bb3adf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..c663c209767
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..5d7b3c94250
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..0eb10a224b4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..e413286edeb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..5e2e08f3a75
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..433bae3c5bb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..762b46f345f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..27e5f716b3a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..687598c5f55
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "srcdoc"
+            }
+          ],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..0b035d26e38
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..dec56bc9a0d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..64cd66eac68
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..15e60b67956
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..c0d07f85854
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..e53ac512441
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..cd75aa203eb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..9be0bf3fadd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..4c3708d687f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..bf27bb46161
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..5a9c1cdf386
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..c424f516c3b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..67f97ec87be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..54429d45e45
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..b756a252c44
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..41916d9334f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..b1601e51a5f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..f70ca471457
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..b4f87226182
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..078d1f15e0c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..da81f5061c6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..aa7f4bda7ed
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..9ee83c852c9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..cb6e6ff16bd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..282c1793384
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..8cf052f45be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..15fd0d762a1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..6c724928524
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..8b2487bc3c1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..97857ee903a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..a5d151a9eb4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..b07400aa18a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..dd3bea4a79b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..485b6592c14
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..861b00b2d91
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..480f7f1a970
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..7df7be8a530
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..f40eaddf0f9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..aec116e896b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..89a479c00e6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..2414af93892
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..0dda649cd20
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..73a715bbcc4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..b858e2be2cc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..cdd4ddf4ce4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..b7836bba091
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..855006c31d9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..eceeb454721
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..024396c44f3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..a047bf3477b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..ba9982d8e7c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..c7de2e6f0f2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..2884fcab6ef
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..31046accc27
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..fd4d4237c0d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..262d8d249c4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..819e7d249b0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..5bb5c513682
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..558c333c2c3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..0bdeb265ae9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..fe36ce6c7fa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..9631d04e259
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..c9d2e50d8c9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..6d85d0baea2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..6586f1ffe24
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..2e98a643347
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..180358e691b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer-when-downgrade
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..408834c03d7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..a2f92d657a5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..51c29e644d9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..d0725a2557a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..c33acb3704a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..48c549827f6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..853b7ef4836
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..9d4cac3345e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..c89a33c4635
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..3db4fa975f0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..29f691c70ff
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..7e279445157
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..e7c08bbcaf9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..69607cb0778
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..d7d0ba3b381
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..47c57013f44
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..4e3bb1a06fd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..5a7ab10c413
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..7f1d12f1079
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..1b06a5a9545
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..e6c56b11744
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..ddec0c50687
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..3bef6b38ae8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..c355cc7b41e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..044a0013137
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..bdb0050f728
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..02a0f736459
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..552e0de05df
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..99bf6df0357
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..bf2fd15f642
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..8ba7fc0528c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..200e236256b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..9390f89ac8c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..ea628172c34
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..98937d42ace
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..0f5a13efe12
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..8045577914e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..db12593a432
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..1c276c8fdbb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..47f19e9573c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..b7aa32c2f57
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..c2b727e575a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..464eb4cd1b8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..1ac4dfe81db
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..9d133b182e1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..86255c2a239
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..0d852928863
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..734134e44fe
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..6aeed041c1d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for sharedworker-classic to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..c3825ec079c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for sharedworker-classic to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..db76379cc9f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for worker-classic to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..f71ac8e8f40
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for worker-classic to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..b0be8268545
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for worker-module to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..475110a72fc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for worker-module to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..cfe73628d05
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..17c0bd59f0d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..a7b975cd619
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..7fff66d3a49
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..9d1fe345515
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..9edc5d8ab07
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..43f324a85c9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..22709fed295
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..25009254d8e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..6be0685716c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..52b9fc83154
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..ef75493d593
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..b3b55087edb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: no-referrer
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..75f4815eb6b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..37756d8c5be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..3ca0ed8c850
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..8090e7ed378
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..39c7104194e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..edd61515cb3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..6272ff9bdcf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..dca65f1663a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..a262455d5cb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..586a69b543e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..f25400a4268
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..ef1fcf8da02
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..f2553d67ff4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..be21cda94d5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..477481d955f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..7c74c301a92
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..b83ae5afb16
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..3b87e0e1ee4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..b34218514f0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..7b9551f94f9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..b3c8f8bc7b7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..e3549e3092e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..86d8dc5a296
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..e676ab91424
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..ed27eab67b0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..a4f111ba329
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..23dbc764034
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..b09a25e8006
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..40453628c96
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..548a99f10bc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..ae909bd8684
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..4bb4990a18c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..45781d6ccd8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..99a9367616d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..23f279f394a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..a2197378de8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..cc79bca168c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..1a877c7a62f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..820c56c2990
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..64764c8002c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..310e2242d2d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..755cb361f23
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..d4d2b40461c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..55235947114
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..e82ea504715
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..c0009b6a50a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..82af386aad9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..c77c8f20211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..47ef7569831
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..12f851e769b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..5cfd674ea22
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..04f454b3877
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..655c76f1c03
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..0106b3154b8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..357cefe6efb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..25a6a3c9791
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..617947e662c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..4eaee8e8e4d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..57e98ebc915
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..821f46b4016
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..1ae656ab508
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..d95dfa1fd2c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..e0d685b6fc9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..09f77e2adab
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..3ed876f46d4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..48babe4a998
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..a15ea7c65c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..6cbfb06d497
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..6bd5806921b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..250185ba9f4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..b66c4da0baf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..40a04d29f88
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..eb1a8f79619
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..e3569f1d503
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..1d138fae4c4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..092fec8239c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..7202a43af1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..199f948f395
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..e254d58d35f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..0044911c2d8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..fd06406bc98
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..e3ac6f648e3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..78b5cfa3bb9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..86cf62f479d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..58ff33f8024
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..51910edd9d3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..3432542251d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..f0827d96efb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..a9fc93d6b54
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..eaf0c719cdf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..72264666b13
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..16ea22743cb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..eb9dcf78318
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..1872a9310f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..7cb2e58c22f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..5993c1a4dc4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..2a00f3c6fdc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..f41dd8ed255
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..23f60063607
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..17e0f040996
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..3c0453f8617
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..9d0609167f1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..6c00fd9985f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..5bee1774b3f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..580b42e0c99
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..413b20aa2bd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..29f367a04e8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..d2c5bfc2bfc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..63670d98597
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..1b150f1cf65
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..3b8b1ced900
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..bfdb519d4b4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..eec55f1a686
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..028ccc9d419
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..7c9efe9c540
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..0e8b46c9504
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for sharedworker-classic to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..13249150441
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for sharedworker-classic to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..516598a9408
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for worker-classic to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..d2b60caa30d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for worker-classic to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..7c4685d0160
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for worker-module to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..6d60f9473ab
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for worker-module to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..d1cf15a5745
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..fe4f588ad94
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..4106f858486
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..09fb97ad952
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..5f6c2bdb9e0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..cb8df81462a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..8aca08162ba
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..c6d243af554
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..2f672f8f536
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..dfa0026566a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..9802aebc812
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..823d510fb73
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..ecff74b90dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..b0c2bb82783
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..4b04c2b5f22
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..53818e45328
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..50eedd46d53
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..594d1e23709
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..b52735fed34
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..88168ccbf8c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..5c6b99310ee
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..dc653329cf1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..d7cf4f1fffd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..3efc9cd5a37
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..16e6f6c59ff
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..03bc1011caf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..29d622ea25e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..e4322a6a1c7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..9ed0d18972a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..5692389863e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..45819d53de3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..38fc13c7504
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..604a68f372c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..8c9e5231584
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..47c03577e38
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..84548e25449
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..73b4b43fe3e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..dbba3b8e308
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..c91e2027091
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..f2b58faa4d8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..95dcbba40a1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..ccdaab708b3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..1224211f845
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..35fac64aafb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..ccdc442b35a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..0e9b3556af2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..e5b72cf0743
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..c00d12de0b1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..956910d4f81
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..64907c87168
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..09b1c1f7449
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..a5307e7bc4b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..e15574fbc4b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..fa383bbb814
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..ecd1f5a1658
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..02710110601
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..30deddfd1a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..5a734b9201d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..fac2c79ad64
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..d70c192e45a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..1cf3b441ce9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..f8b167293ff
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..34413f44d0b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..2dcc45119a1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..843b7b8bd8e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..e8e560af2a0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..12198095da2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..300bcba4cf8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..82729f56cca
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..be66cf93211
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..856bd37ac9b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..fd4826682ac
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..fd82f1b1104
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..223f1866e9d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..6c803c76527
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..d2592196334
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..30a6824fb62
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..2034b691689
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..dd8050cb07c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..ba8468ff86f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..40905ede8f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..566975302f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..b68c3399124
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..7949aae354d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..654c8d00c86
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..b9bfa6a5214
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..d403af05d75
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..87820e5812e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..f5dfb70043f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..a9f0ac0a967
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..98ae2c0006f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..8c4a715c277
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..8c477e58e5e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..37d55ef305f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..cf39ccd38ad
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..f447202e3d5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..e83c17e2b87
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..113be97571c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..c52b4f5535b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..3834bf371f2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..02cf5abed0c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..ef022b72dfa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..a79346508dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..eeb927bfa60
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..1c0e791357f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..7b30449b1f9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..a20e420662d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..969f993927a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..47f37f86f3a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..77df78413f2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..af9cf983258
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..020c41e1773
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..bd169400464
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..ed74429ca15
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..ebcc6bac5b9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..cc8c6adb809
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..1c1bb7697f0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..df62047bff0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..17a8d06b6d8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..85c37ed2762
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..4d8aedb4004
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..52b029e38f3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..f9629af5961
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..751470c0f11
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..5bfcfcf0c39
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..df7902ed007
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..aa3ae70aac1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..7dcd6a27c5d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..900b0694a59
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..733ccaa102d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..32d9172e807
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..1d2c73a4fee
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..5bd5fc1da3c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..83ca559a9cf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..5e988c33a2c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..e3a7bf03723
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..4cff1d12f82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin-when-cross-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..057180a979d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..3688dc22422
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..1ded06e4b46
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..06167dd942e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..a1dee152b5d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..d774b21538c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..ea3dad3bf8f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..ac35310f0ba
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..f61aada87f6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..96a82aecc23
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..024dcdbb855
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..107bd7812f4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..60b9f6766d1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..af995ca2ead
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..60a98bedc8b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..b12f577a879
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..fa99e45193e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..d5834fb1a1d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..f10620601c4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..256d8289726
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..582bca8a55d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..0edd958eaa6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..f4225e0e34d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..e71abffe430
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..fcfb36be078
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..c5f506163b0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..e42ec7f173c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..bc459e949d2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..35179b3793e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..6657261925b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..1256c4229cb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..7976130fb94
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..46fcbefebcb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..214285a9cc7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..861d5510267
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..caff7fe9313
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..c050bef9fac
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..7e9c5c20582
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..949d6267406
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..9544b914dda
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..12a3345a651
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..da5ec0b4fcc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..8f52a22b3c2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..c9c71a76d6b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..d6c7639e7d1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..0252877d323
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..a1794947532
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..b88a6e8267f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..0164b064deb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for sharedworker-classic to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..289fc670546
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for sharedworker-classic to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..7561b4a0882
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for worker-classic to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..2244a4cab6f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for worker-classic to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..4fa1f76fc9c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for worker-module to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..f1f946f6df1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for worker-module to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..62b1d9fcfff
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..70fb9f9b1a2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..7fa069a3df4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..443e5e99ebd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..946ef6f0d6e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..24165be3275
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..46f49d813cc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..5d6ae0ab3a6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..c0f82076021
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..ac0c3e71bbf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..83ad4b62912
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..92157004fac
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..1c32fba5a1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: strict-origin
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..46f755716fb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..ea92aa8bb90
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..81b93dbc335
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..8f83d836372
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..652544ef076
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..501473cb7d1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..a4ab8302d9a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..f4446f7c759
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..32f80b9210e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..ff6aafe80dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..5b4309f61bc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..dbf8920ceb0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..e184f2f99d0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..e713b614473
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..efcacb80db5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..0e0ad876258
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..7aa58b40dd9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..96940d924c5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..826f0129e49
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..ff42df4b3c1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..abd462ee755
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..141ccdb31ae
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..b322ae35886
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..1cafbbc10b4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..d8beb3587ad
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..d70214a0bbc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..8f93cee2472
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..fe438d62a8b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..aa3d84b0d72
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..5b7a08d20b0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..aedc3236108
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..ec1ff22f3be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..632a02bf290
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..16ae57857d5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..10b36291cf7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..4b3b746577e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..ae46fd10a28
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..cceae990937
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..9730c086bb4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..edb2870fd2a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..85bcee05924
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..cbe536dad6b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..f0020630ccb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..632083161f0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..857b3cc3b11
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..27a0f129237
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..bb7bd17c076
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..3e38bae9f2b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..4783f45ac9d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..f2f186cdfda
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..08a9996882f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..4230c620d52
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..94f6837bc9d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..3c533839f64
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..b97e5c69991
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..3de9921101b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..4a927af2bb0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..c90180a3a07
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..6c5cd5d0323
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..433913e65b1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..82d546f3030
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..76dfb9bcc00
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..cd9a26e1a25
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..8a345aab4f5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..770b6be72ab
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..557c897f6dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html.headers
new file mode 100644
index 00000000000..c1d3fd1a0be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html.headers
@@ -0,0 +1,2 @@
+Access-Control-Allow-Origin: *
+Referrer-Policy: unsafe-url
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..ea2e8d11948
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..2cfe2a0fb99
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..44501a5f736
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..9f51a700456
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..b16692f66d4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..532809dd0af
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..99882a623cc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..aae08809fa2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..b8dbbd6e029
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..5480d46ff3f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..0edaa41c1c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..2bcb3cbe6ec
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..97ec687004a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..d631a6dcb12
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..2d627c6d22e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..366e8665a62
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..3a55660c0e4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..9b857831f09
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..d80ff5a5807
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..012d095ef49
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..f2f4595415a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..667567ebba1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..2824cead304
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..9efcc95c2aa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..3d9206f18f1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..6d5c1e56cb2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..51596668d93
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..9cd2d1ffee5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..4d71131d9b9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..29a55b76272
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..09f9e964f66
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..ee69797376a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..8b9f2909c64
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..63ae656a1bc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..63a3adfeee1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..bf559ef2fa1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..e49bb460dba
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..cc431565cb1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..acba24bf648
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..6d335a915c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..a72d9f9d555
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..5ae41b8a475
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..41d2ffbf3bb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..c5034618698
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..ccf74bfc978
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..1f3c30737f9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..8b7f117bd90
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..de7ff149fad
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..bf5fbd15347
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..019f99b8515
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..bb03d60a754
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..2647d9c0068
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-module/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..48e9b2fc797
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-module/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-module/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..c471a2ab65f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-module/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..d05cf044d6b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..a46b1806e1d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..bb3472038d3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..d7ff137270e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..d2fe3e21cd9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..5646eec5988
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..67e588307b5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..e165cb1f414
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..395832acebd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..99224b7cb6b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..a2c89524c97
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..d868323f574
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..d5c1ef92532
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..e1b9a4e96e3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..ff187967c8a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..aebd3352749
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..ebc64f516ad
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..6d2aee1733f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..2e465f61035
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..eb63faeca13
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..74d717b82d0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..d889f2addda
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..3a1981b72b4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..e8c9f719f6c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..0e6de725c15
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..f00394f8864
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..29bbb89fcd4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..edb2f7d6cf4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..245f0e9c422
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..ddd427653f9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..118bb843efb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..e55d45239c2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..34652fae30b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..798a95496ef
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..399775f8fd6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..99b647b458a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..b09756f12a1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..d2a2b71e826
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..f7c457e5f29
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..24eb8842d05
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..17bb9c2610e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..29bbc505f9d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..7963b7905c6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..843e6926217
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..464aba106c1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..7dc965416c5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..f941e1e48f9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..1e369f1d45d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..780113a6ee4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..75648ff4ecf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..816854345fd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..0ab03889e98
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..c7095216619
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..37ac290d6b3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..70ea4320555
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..0a25233e4f1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..0460050d4ba
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..0e7cdab08f8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..7fb8cf98201
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..e49c19a7486
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..d7be1b63225
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..79dc86420b0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..013fc3a5a3f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..20c9d84a140
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..9d9b89a2560
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..71d97ee0390
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer-when-downgrade">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..29533784c3f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..fa3d946a8ae
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..aea45c919e4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..787b33c1ea0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..8295a63e05a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..3481eda3ed7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..153563a38b3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..c1910747623
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..1d87d656f67
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..38fe934f9a9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to same-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..a43637790ac
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to same-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..98fe5237308
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..bb306873bd8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..f8e7262bd81
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..b0d75cf0323
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..6892ef7c4d4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..589122d0e9f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..f4b1440f04b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..3d85b52254e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..89d6d634187
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..ba283d5a737
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..35b805dcf30
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..fb1f7ad461b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to same-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..60516dfec79
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..9574d97ad89
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..b71bb9fe8ad
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..12cc3dd81a7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..8bfbb561e96
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..9bec2a9a425
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..f0e8af619c0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..42f74dc4a20
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..87492a8c651
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..f4f634401b1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..7aae843c139
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to same-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..127e701ac50
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to same-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..916cbe7f4a7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..238d76c056d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for sharedworker-classic to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..a0902935a13
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for sharedworker-classic to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..047a7a8f891
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for worker-classic to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..075b7c7043f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for worker-classic to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-module/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..9150b8631d7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-module/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for worker-module to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-module/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..e0d49ad7059
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-module/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for worker-module to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..0ef6e1031f8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..c7ecbb83014
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..12cb9b5ba93
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..28d9711ca7c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..e72cc70a4f2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..896939dfae5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..22886a1de58
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..9c5bbb3e914
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..c526d733ebf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..1d3a007c1ef
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to same-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..793c851998d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to same-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..98b4af4aa36
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..74384c6c1f4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..84dfbd78e6c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..1cb2eb25b98
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..28b8c144474
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..92caf095e05
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..05e1d8ed70c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..5a2c3706c77
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..98119ade78e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..153fbe73c33
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..eebe2d506ac
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..556d503c973
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..1f1d780c615
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..c40ee82385e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..bf99ea1b980
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..47ce26153a6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..450142261f3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..e96342b7d30
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..3aed5628194
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..a280c51a648
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..9c6ccb79207
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..829e02d2b63
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..ae420db20ac
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..6aed72d2702
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..f29d9a5f033
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..e2b5a99d82b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..386be93bf63
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..3a5518eadd0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..88126506ddd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..dacd343e0cc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..6ca297fdafa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..ac0e701aaa3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..36a6ca56fe5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..3196566b196
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..8c41b0aa0a8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..1fdda9f6e1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..228b216bf60
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..d8b81424121
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..13907b6ee3f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..2d47f33f961
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..1a94c31e6e6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..0014f469562
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..8153dc4feac
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..3c5fde6f183
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..3615808744e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..3103661f217
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..6adf33ef956
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..187fcb55c86
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..d0a06592032
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..fd98090afeb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..5ca1a8f90de
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..ef2c88d8a3d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..ccb48c90102
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..95c24803a4c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..3a3eeacb397
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..867e453f9c9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..b2ddcd35351
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..955985163c2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..8cc66b40477
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..6f7f790742b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..a8475099903
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/cross-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..fdfcaa51c37
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..7daa30e19be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..bbc11c950d1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..f07cda1a0ae
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..17ced6cb633
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..297a37bcccd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch/same-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..aec51043d25
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..ea5a1e65912
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..5dd09037aed
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..d2eace1a501
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..7a2872df2d6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..6c3af754b61
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..1fde956c52e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..9090a56f19c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..69827f5e71d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..321ff5d2dfb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..46d567048a5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..64567589fa4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..2494c0a49e8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..5be226f439c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..3496ddd889f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..ec31a89afa5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..fcf281ec367
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..93076790b29
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..7f420bd58c1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..75182127e9b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..26f358b9db9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..f6a725d3963
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..b09d3f025e9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..9e57f2f6421
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag/same-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..32c9c6a506f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for sharedworker-classic to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..f24202d4c1b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for sharedworker-classic to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..525c4babfbf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for worker-classic to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..c1c8aa627c0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for worker-classic to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-module/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..8482d7d2aaf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-module/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for worker-module to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-module/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..01fd9140510
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-module/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for worker-module to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..10ae3a06788
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..21015150882
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..8450e8b7044
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..f2093096565
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..bd7f2f73327
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..ee4f2c5c6b1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/cross-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..011a0a9d20f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..aed06c5c1b8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..c6d9c461b9b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..cb5e94086b0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..1702c3f10f8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..674b324bded
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr/same-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..4623293b2b9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..3d2b7856f67
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..6f86e2c9fe6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..9734af21a03
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..dd32b51d9cd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..375ac257f6a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..6742ffba568
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..67ecbd6eefb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..6163be73c9e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/same-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..0bc2c07d831
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch/same-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..cf05e166a23
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..15ac1c56f43
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..54a2884ecd3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..3e7e1bc166b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..942691f66ae
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..cf51aa15b1b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..d87e8674b1d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..8bc96f3cb55
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..16e76d16d20
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..84063c89db2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..b7e3924092b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..5ff171a3863
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..0361ecee042
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..c2223be2345
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..9655ad2b238
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..dab25e384d7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..694a8a845b2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..6dfac02ae12
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..65d0d037142
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..3c6e7b143e9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..d5396abbc58
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..d6e198ad0a9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..bb60709ee88
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..1054ef30ef0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-module/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..3896c5c5d21
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-module/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-module/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..ce7fa2f2298
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-module/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..49168ce2fba
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..0f6ad03b52f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..b081fd75cab
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..d6ce96eac62
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..8c35488b0b4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..1ef6481ad45
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..2a1f7434eb3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..4d21f0d155a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..2db9e9aae41
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/same-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..c38435bd25c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr/same-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="same-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "omitted",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..9b79a324fcf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..5e6b89694dd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..a2159631980
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..e47bee01a5e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..87e7a2fa113
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..cc43a46b975
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..8d5fcabef90
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..ac1c025ef8f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..489f5774d9d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..765f0bb9420
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..8752c9a7426
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..07aebd3a634
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..b4667774510
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..bffd18d59d5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..0ba113edbdc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..e7359287614
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..e8d8b617ad0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..d961eafb7fc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..fad227d9b3b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..04941be8e60
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..d060ed1e12d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..9fb1fe3b6ca
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..83146badd7f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..542d4e266eb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..c076fc85e27
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..88ad2099aa1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..f72a238f1b0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..7086dc263bc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..374e670f2ea
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..e6a4a1cae83
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..370b27bd52c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..378e4373ddc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..e1fd5deaedf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..06b54e84a10
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..dfda8a029c2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..09065d9a990
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..795b1a698b0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..704f1cfab82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..8dc9c49ef91
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..0d782a2f3e5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..00c95830a33
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..4634152ff50
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..ef5004a9269
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..e66aad43404
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..39a59503848
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..75dc714ae3b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..ca88f4bd3a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..11eef668cf9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..657c7d09ca4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..d8d3a81e2ba
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..98c953b11fd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..26c1f00dde2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..798f6fc480a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..2f861ecf84f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin-when-cross-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..86a8cf5916a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..7165df9b9a2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..eac9d1e3e32
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..5baa5232bbc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..386451d9d50
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..0ff2d30e0a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..698db2d282f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..8db97af5364
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..e86ce77b4a8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..2e486d4b7dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..940d3b30e42
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..c33feb0e35f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..3107b816c5b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..0bdc0868631
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..6b63d1831ff
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..0ffbbb95fc5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..0ccfc472390
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..d6c376a4e65
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..2d40b45cc00
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..f7f02844de2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..3bd77a1c633
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..ae494dbee49
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..8d9b5f4d3d9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..0abed458763
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..eaf16c30210
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..1488f50aff8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..b61faea974a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..4bf90c57269
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..eba80e2a1ef
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..b38f5ba075e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..63bcd9f654c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..432125bc005
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..c47194b15ef
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..bf42bba75f2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..a7195a0f8f2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..b4119eb7c42
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..6b00a6bd35a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for sharedworker-classic to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..3d57f36d479
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for sharedworker-classic to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..8360ff528ad
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for worker-classic to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..35243d8c0df
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for worker-classic to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..5292a9f479b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for worker-module to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..9f6cb30717f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for worker-module to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..20be1ee2d82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..fd280355417
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..878d1b0c28d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..5511aa6d54f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..ff0984afa87
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..6381e3025fd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..236eab003ff
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..c47edfd1881
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..5f4e9a08c83
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..28192674c92
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..02c868a4672
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..20f964044e2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="strict-origin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "origin",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..383a91559b3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..3a7df294f9a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..557684095b1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..85a20c12d97
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..0c058c0832f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..91884c7afe6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..ad39013c5f3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..2bc73e76e68
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..7a69b529789
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..4cda477b772
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..ed261048b38
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..cb5bcf637be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..5e9376358b9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..50532da8910
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..4a6fbf0d03a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..f20be36ad1c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..1925370c86b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..4474708caac
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..ac6bcec6450
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..a6364188266
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..4b7889385be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..0bbc78707db
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..63d3c37d89a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..af08f36ef37
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..95b58fa5d65
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..f70dab3d46a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..e5dbfb16d0d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..b740b81c258
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..dcc34b6ef19
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..bc7ee4cce9b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..052c6cf287b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..acd64f240b9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..5553fe06a0a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..ed63b00877c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..9dd6c3b3b52
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..d46b65c5d6e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..04c02ae47ef
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..83b4baf0bb3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..bcaf210bc4a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..7f3fd250721
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..01bc2a61fae
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..5af7f8fc21a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..77aaa879312
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..6e1b0196217
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..bb955ba7656
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..21f65dedfd3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..b19fa390d20
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..43fa7e0286e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..69d157e43a9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..f481905747b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..b359aeeb63f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..eb14cf0a195
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.keep-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..d46b4cd5c2a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.no-redirect.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..189c6bc5144
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.swap-origin.http.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.">
+    <meta name="referrer" content="unsafe-url">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..ea2e8d11948
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..2cfe2a0fb99
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..44501a5f736
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..9f51a700456
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..b16692f66d4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..532809dd0af
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..99882a623cc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..aae08809fa2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..b8dbbd6e029
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..5480d46ff3f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..0edaa41c1c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..2bcb3cbe6ec
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..97ec687004a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..d631a6dcb12
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..2d627c6d22e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..366e8665a62
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..3a55660c0e4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..9b857831f09
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..d80ff5a5807
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..012d095ef49
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..f2f4595415a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..667567ebba1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..2824cead304
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..9efcc95c2aa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "iframe-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..e49bb460dba
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..cc431565cb1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..acba24bf648
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..6d335a915c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..a72d9f9d555
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..5ae41b8a475
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..41d2ffbf3bb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..c5034618698
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..ccf74bfc978
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..1f3c30737f9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..8b7f117bd90
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..de7ff149fad
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..bf5fbd15347
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..019f99b8515
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "sharedworker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-classic/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-classic/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..bb03d60a754
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-classic/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-classic/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-classic/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..2647d9c0068
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-classic/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-module/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-module/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..48e9b2fc797
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-module/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-module/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-module/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..c471a2ab65f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-module/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-http.keep-origin.http.html
new file mode 100644
index 00000000000..d05cf044d6b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-http.no-redirect.http.html
new file mode 100644
index 00000000000..a46b1806e1d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-http.swap-origin.http.html
new file mode 100644
index 00000000000..bb3472038d3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-https.keep-origin.http.html
new file mode 100644
index 00000000000..d7ff137270e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-https.no-redirect.http.html
new file mode 100644
index 00000000000..d2fe3e21cd9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-https.swap-origin.http.html
new file mode 100644
index 00000000000..5646eec5988
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/cross-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "cross-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-http.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-http.keep-origin.http.html
new file mode 100644
index 00000000000..67e588307b5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-http.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-http.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-http.no-redirect.http.html
new file mode 100644
index 00000000000..e165cb1f414
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-http.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-http.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-http.swap-origin.http.html
new file mode 100644
index 00000000000..395832acebd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-http.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-http",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-https.keep-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-https.keep-origin.http.html
new file mode 100644
index 00000000000..99224b7cb6b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-https.keep-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "keep-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-https.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-https.no-redirect.http.html
new file mode 100644
index 00000000000..a2c89524c97
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-https.no-redirect.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-https.swap-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-https.swap-origin.http.html
new file mode 100644
index 00000000000..d868323f574
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr/same-https.swap-origin.http.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "stripped-referrer",
+          "origin": "same-https",
+          "redirection": "swap-origin",
+          "source_context_list": [],
+          "source_scheme": "http",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/referrer-policy-test-case.sub.js b/tests/wpt/web-platform-tests/referrer-policy/generic/referrer-policy-test-case.sub.js
index 972ce8de066..4722b0b1b8b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/referrer-policy-test-case.sub.js
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/referrer-policy-test-case.sub.js
@@ -51,6 +51,41 @@ function stripUrlForUseAsReferrer(url) {
   return url.replace(/#.*$/, "");
 }
 
+function invokeScenario(scenario, sourceContextList) {
+  const originTypeConversion = {
+    "same-origin-http": "same-http",
+    "same-origin-https": "same-https",
+    "cross-origin-http": "cross-http",
+    "cross-origin-https": "cross-https"
+  };
+  const urls = getRequestURLs(
+    scenario.subresource,
+    originTypeConversion[scenario.origin + '-' + scenario.target_protocol],
+    scenario.redirection);
+
+  const deliveryTypeConversion = {
+    "attr-referrer": "attr",
+    "rel-noreferrer": "rel-noref",
+    // Other delivery methods such as "http-rp" are ignored here because
+    // they are already applied to the main document by generator.py.
+  };
+
+  /** @type {PolicyDelivery} */
+  const delivery = {
+      deliveryType: deliveryTypeConversion[scenario.delivery_method],
+      key: "referrerPolicy",
+      value: scenario.referrer_policy};
+
+  /** @type {Subresource} */
+  const subresource = {
+    subresourceType: scenario.subresource,
+    url: urls.testUrl,
+    policyDeliveries: [delivery]
+  };
+
+  return invokeRequest(subresource, sourceContextList || []);
+}
+
 function ReferrerPolicyTestCase(scenario, testDescription, sanityChecker) {
   // Pass and skip rest of the test if browser does not support fetch.
   if (scenario.subresource == "fetch-request" && !window.fetch) {
@@ -66,17 +101,6 @@ function ReferrerPolicyTestCase(scenario, testDescription, sanityChecker) {
   // This check is A NOOP in release.
   sanityChecker.checkScenario(scenario);
 
-  const originTypeConversion = {
-    "same-origin-http": "same-http",
-    "same-origin-https": "same-https",
-    "cross-origin-http": "cross-http",
-    "cross-origin-https": "cross-https"
-  };
-  const urls = getRequestURLs(
-      scenario.subresource,
-      originTypeConversion[scenario.origin + '-' + scenario.target_protocol],
-      scenario.redirection);
-
   const referrerUrlResolver = {
     "omitted": function(sourceUrl) {
       return undefined;
@@ -89,15 +113,16 @@ function ReferrerPolicyTestCase(scenario, testDescription, sanityChecker) {
     }
   };
 
-  const checkResult = (expectedReferrerUrl, result) => {
-    // Check if the result is in valid format. NOOP in release.
-    sanityChecker.checkSubresourceResult(scenario, urls.testUrl, result);
+  const checkResult = (expectation, result) => {
+    let currentURL = location.toString();
+    const expectedReferrerUrl =
+      referrerUrlResolver[expectation](currentURL);
 
     // Check the reported URL.
     assert_equals(result.referrer,
                   expectedReferrerUrl,
                   "Reported Referrer URL is '" +
-                  scenario.referrer_url + "'.");
+                  expectation + "'.");
     assert_equals(result.headers.referer,
                   expectedReferrerUrl,
                   "Reported Referrer URL from HTTP header is '" +
@@ -105,30 +130,6 @@ function ReferrerPolicyTestCase(scenario, testDescription, sanityChecker) {
   };
 
   function runTest() {
-    const deliveryTypeConversion = {
-      "attr-referrer": "attr",
-      "rel-noreferrer": "rel-noref",
-      // Other delivery methods such as "http-rp" are ignored here because
-      // they are already applied to the main document by generator.py.
-    };
-
-    /** @type {PolicyDelivery} */
-    const delivery = {
-        deliveryType: deliveryTypeConversion[scenario.delivery_method],
-        key: "referrerPolicy",
-        value: scenario.referrer_policy};
-
-    /** @type {Subresource} */
-    const subresource = {
-      subresourceType: scenario.subresource,
-      url: urls.testUrl,
-      policyDeliveries: [delivery]
-    };
-
-    let currentURL = location.toString();
-    const expectedReferrer =
-      referrerUrlResolver[scenario.referrer_url](currentURL);
-
     function historyBackPromise(t, scenario) {
       history.back();
       return new Promise(resolve => {
@@ -148,43 +149,37 @@ function ReferrerPolicyTestCase(scenario, testDescription, sanityChecker) {
 
     // Request in the top-level document.
     promise_test(_ => {
-      return invokeRequest(subresource, [])
-        .then(result => checkResult(expectedReferrer, result));
+      return invokeScenario(scenario)
+        .then(result => checkResult(scenario.referrer_url, result));
     }, testDescription);
 
-    // `Referer` headers with length over 4k are culled down to an origin, so, let's test around
-    // that boundary for tests that would otherwise return the complete URL.
+    // `Referer` headers with length over 4k are culled down to an origin, so,
+    // let's test around that boundary for tests that would otherwise return
+    // the complete URL.
+    // Different subresource URLs are used because getRequestURLs() is called
+    // for each sub test which returns a unique URL.
     if (scenario.referrer_url == "stripped-referrer") {
       promise_test(t => {
         history.pushState(null, null, "/");
         history.replaceState(null, null, "A".repeat(4096 - location.href.length - 1));
-        const expectedReferrer = location.href;
-        // Ensure that we don't load the same URL as the previous test.
-        subresource.url += "&-1";
-        return invokeRequest(subresource, [])
-          .then(result => checkResult(location.href, result))
+        return invokeScenario(scenario)
+          .then(result => checkResult(scenario.referrer_url, result))
           .finally(_ => historyBackPromise(t, scenario));
       }, "`Referer` header with length < 4k is not stripped to an origin.");
 
       promise_test(t => {
         history.pushState(null, null, "/");
         history.replaceState(null, null, "A".repeat(4096 - location.href.length));
-        const expectedReferrer = location.href;
-        // Ensure that we don't load the same URL as the previous test.
-        subresource.url += "&0";
-        return invokeRequest(subresource, [])
-          .then(result => checkResult(expectedReferrer, result))
+        return invokeScenario(scenario)
+          .then(result => checkResult(scenario.referrer_url, result))
           .finally(_ => historyBackPromise(t, scenario));
       }, "`Referer` header with length == 4k is not stripped to an origin.");
 
       promise_test(t => {
-        const originString = referrerUrlResolver["origin"](currentURL);
         history.pushState(null, null, "/");
         history.replaceState(null, null, "A".repeat(4096 - location.href.length + 1));
-        // Ensure that we don't load the same URL as the previous test.
-        subresource.url += "&+1";
-        return invokeRequest(subresource, [])
-          .then(result => checkResult(originString, result))
+        return invokeScenario(scenario)
+          .then(result => checkResult("origin", result))
           .finally(_ => historyBackPromise(t, scenario));
       }, "`Referer` header with length > 4k is stripped to an origin.");
     }
@@ -196,16 +191,40 @@ function ReferrerPolicyTestCase(scenario, testDescription, sanityChecker) {
       return;
     }
 
+    // We skip <srcdoc> tests for attr-referrer, because delivering referrer
+    // policy via DOM attributes inside <srcdoc> is quite similar to doing
+    // so in the top-level Document.
+    if (scenario.delivery_method === "attr-referrer") {
+      return;
+    }
+
     // Request in a `srcdoc` frame to ensure that it uses the referrer
     // policy of its parent,
     promise_test(_ => {
         /** @type {Array<SourceContext>} */
         const sourceContextList = [{sourceContextType: "srcdoc"}];
 
-        return invokeRequest(subresource, sourceContextList)
-          .then(result => checkResult(expectedReferrer, result));
+        return invokeScenario(scenario, sourceContextList)
+          .then(result => checkResult(scenario.referrer_url, result));
       }, testDescription + " (srcdoc iframe inherits parent)");
 
+    // We skip (top Document w/ referrer policy by HTTP headers)->
+    // (<iframe srcdoc> w/ overriding referrer policy) tests, because we
+    // already have similar (top Document w/ referrer policy by <meta>)->
+    // (<iframe srcdoc> w/ overriding referrer policy) tests.
+    if (scenario.delivery_method === "http-rp") {
+      return;
+    }
+
+    // We skip (top Document w/o referrer policy)->
+    // (<iframe srcdoc> w/ overriding referrer policy) tests, to simplify the
+    // generator. We already have (top Document w/ referrer policy)->
+    // (<iframe srcdoc> w/ overriding referrer policy) tests, which verify the
+    // <iframe srcdoc>'s referrer policy behavior.
+    if (scenario.referrer_policy === null) {
+      return;
+    }
+
     // Request in a `srcdoc` frame with its own referrer policy to
     // override its parent.
     promise_test(_ => {
@@ -214,16 +233,14 @@ function ReferrerPolicyTestCase(scenario, testDescription, sanityChecker) {
         const overridingPolicy =
             scenario.referrer_policy === "no-referrer" ? "unsafe-url"
                                                        : "no-referrer";
-        const overrridingExpectedReferrer =
-          referrerUrlResolver[overridingPolicy === "no-referrer"
-                              ? "omitted"
-                              : "stripped-referrer"](location.toString());
+        const overrridingExpectation =
+            overridingPolicy === "no-referrer" ? "omitted"
+                                               : "stripped-referrer";
 
-        /** @type {Subresource} */
-        const subresourceWithoutDelivery = {
-          subresourceType: scenario.subresource,
-          url: urls.testUrl
-        };
+        const scenarioWithoutDelivery = Object.assign({}, scenario);
+        // Omit policy deliveries applied to subresource requests.
+        // This is hacky method but will be removed soon.
+        scenarioWithoutDelivery.delivery_method = null;
 
         // <iframe srcdoc> with overriding <meta> referrerPolicy.
         /** @type {Array<SourceContext>} */
@@ -234,8 +251,8 @@ function ReferrerPolicyTestCase(scenario, testDescription, sanityChecker) {
                                 value: overridingPolicy}]
           }];
 
-        return invokeRequest(subresourceWithoutDelivery, sourceContextList)
-          .then(result => checkResult(overrridingExpectedReferrer, result));
+        return invokeScenario(scenarioWithoutDelivery, sourceContextList)
+          .then(result => checkResult(overrridingExpectation, result));
       }, testDescription + " (overridden by srcdoc iframe)");
   }
 
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/test-case.sub.js b/tests/wpt/web-platform-tests/referrer-policy/generic/test-case.sub.js
new file mode 100644
index 00000000000..356f8054f6e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/test-case.sub.js
@@ -0,0 +1,203 @@
+// TODO: This function is currently placed and duplicated at:
+// - mixed-content/generic/mixed-content-test-case.js
+// - referrer-policy/generic/referrer-policy-test-case.sub.js
+// but should be moved to /common/security-features/resources/common.js.
+function getSubresourceOrigin(originType) {
+  const httpProtocol = "http";
+  const httpsProtocol = "https";
+  const wsProtocol = "ws";
+  const wssProtocol = "wss";
+
+  const sameOriginHost = "{{host}}";
+  const crossOriginHost = "{{domains[www1]}}";
+
+  // These values can evaluate to either empty strings or a ":port" string.
+  const httpPort = getNormalizedPort(parseInt("{{ports[http][0]}}", 10));
+  const httpsPort = getNormalizedPort(parseInt("{{ports[https][0]}}", 10));
+  const wsPort = getNormalizedPort(parseInt("{{ports[ws][0]}}", 10));
+  const wssPort = getNormalizedPort(parseInt("{{ports[wss][0]}}", 10));
+
+  /**
+    @typedef OriginType
+    @type {string}
+
+    Represents the origin of the subresource request URL.
+    The keys of `originMap` below are the valid values.
+
+    Note that there can be redirects from the specified origin
+    (see RedirectionType), and thus the origin of the subresource
+    response URL might be different from what is specified by OriginType.
+  */
+  const originMap = {
+    "same-https": httpsProtocol + "://" + sameOriginHost + httpsPort,
+    "same-http": httpProtocol + "://" + sameOriginHost + httpPort,
+    "cross-https": httpsProtocol + "://" + crossOriginHost + httpsPort,
+    "cross-http": httpProtocol + "://" + crossOriginHost + httpPort,
+    "same-wss": wssProtocol + "://" + sameOriginHost + wssPort,
+    "same-ws": wsProtocol + "://" + sameOriginHost + wsPort,
+    "cross-wss": wssProtocol + "://" + crossOriginHost + wssPort,
+    "cross-ws": wsProtocol + "://" + crossOriginHost + wsPort,
+  };
+
+  return originMap[originType];
+}
+
+// NOTE: This method only strips the fragment and is not in accordance to the
+// recommended draft specification:
+// https://w3c.github.io/webappsec/specs/referrer-policy/#null
+// TODO(kristijanburnik): Implement this helper as defined by spec once added
+// scenarios for URLs containing username/password/etc.
+function stripUrlForUseAsReferrer(url) {
+  return url.replace(/#.*$/, "");
+}
+
+function invokeScenario(scenario) {
+  const redirectionTypeConversion = {
+    "no-redirect": "no-redirect",
+    "keep-scheme": "keep-scheme-redirect",
+    "swap-scheme": "swap-scheme-redirect",
+    "keep-origin": "keep-origin-redirect",
+    "swap-origin": "swap-origin-redirect"
+  };
+  const subresourceTypeConversion = {
+    "beacon": "beacon-request",
+    "fetch": "fetch-request",
+    "xhr": "xhr-request",
+    "websocket": "websocket-request",
+    "worker-classic": "worker-request",
+    "worker-module": "module-worker",
+    "worker-import-data": "module-data-worker-import",
+    "sharedworker-classic": "shared-worker",
+    "worklet-animation": "worklet-animation-top-level",
+    "worklet-audio": "worklet-audio-top-level",
+    "worklet-layout": "worklet-layout-top-level",
+    "worklet-paint": "worklet-paint-top-level",
+    "worklet-animation-import-data": "worklet-animation-data-import",
+    "worklet-audio-import-data": "worklet-audio-data-import",
+    "worklet-layout-import-data": "worklet-layout-data-import",
+    "worklet-paint-import-data": "worklet-paint-data-import"
+  };
+  const subresourceType =
+      subresourceTypeConversion[scenario.subresource] || scenario.subresource;
+  const urls = getRequestURLs(
+    subresourceType,
+    scenario.origin,
+    redirectionTypeConversion[scenario.redirection]);
+  /** @type {Subresource} */
+  const subresource = {
+    subresourceType: subresourceType,
+    url: urls.testUrl,
+    policyDeliveries: scenario.subresource_policy_deliveries,
+  };
+
+  return invokeRequest(subresource, scenario.source_context_list);
+}
+
+function TestCase(scenario, testDescription, sanityChecker) {
+  // This check is A NOOP in release.
+  sanityChecker.checkScenario(scenario);
+
+  const referrerUrlResolver = {
+    "omitted": function(sourceUrl) {
+      return undefined;
+    },
+    "origin": function(sourceUrl) {
+      return new URL(sourceUrl).origin + "/";
+    },
+    "stripped-referrer": function(sourceUrl) {
+      return stripUrlForUseAsReferrer(sourceUrl);
+    }
+  };
+
+  const checkResult = (expectation, result) => {
+    // https://w3c.github.io/webappsec-referrer-policy/#determine-requests-referrer
+    let referrerSource = result.sourceContextUrl;
+    const sentFromSrcdoc = scenario.source_context_list.length > 0 &&
+        scenario.source_context_list[scenario.source_context_list.length - 1]
+        .sourceContextType === 'srcdoc';
+    if (sentFromSrcdoc) {
+      // Step 3. While document is an iframe srcdoc document, let document be
+      // document's browsing context's browsing context container's node
+      // document. [spec text]
+
+      // Workaround for srcdoc cases. Currently we only test <iframe srcdoc>
+      // inside the top-level Document, so |document| in the spec here is
+      // the top-level Document.
+      // This doesn't work if e.g. we test <iframe srcdoc> inside another
+      // external <iframe>.
+      referrerSource = location.toString();
+    }
+    const expectedReferrerUrl =
+      referrerUrlResolver[expectation](referrerSource);
+
+    // Check the reported URL.
+    assert_equals(result.referrer,
+                  expectedReferrerUrl,
+                  "Reported Referrer URL is '" +
+                  expectation + "'.");
+    assert_equals(result.headers.referer,
+                  expectedReferrerUrl,
+                  "Reported Referrer URL from HTTP header is '" +
+                  expectedReferrerUrl + "'");
+  };
+
+  function runTest() {
+    function historyBackPromise(t, scenario) {
+      history.back();
+      return new Promise(resolve => {
+          // Wait for completion of `history.back()` by listening the
+          // popstate events that are fired near the end of
+          // `history.back()` processing.
+          window.addEventListener('popstate', resolve, {once: true});
+
+          // Workaround for Safari: Waiting for popstate events causes
+          // timeout in a-tag tests. To avoid timeout, we anyway resolve
+          // the promise.
+          if (scenario.subresource === 'a-tag') {
+            t.step_timeout(resolve, 1000);
+          }
+        });
+    }
+
+    promise_test(_ => {
+      return invokeScenario(scenario)
+        .then(result => checkResult(scenario.expectation, result));
+    }, testDescription);
+
+    // `Referer` headers with length over 4k are culled down to an origin, so,
+    // let's test around that boundary for tests that would otherwise return
+    // the complete URL.
+    // The following tests run only on top-level Documents, because they rely
+    // on navigations using `history`.
+    // Different subresource URLs are used because getRequestURLs() is called
+    // for each sub test which returns a unique URL.
+    if (scenario.expectation == "stripped-referrer" &&
+        scenario.source_context_list.length == 0) {
+      promise_test(t => {
+        history.pushState(null, null, "/");
+        history.replaceState(null, null, "A".repeat(4096 - location.href.length - 1));
+        return invokeScenario(scenario)
+          .then(result => checkResult(scenario.expectation, result))
+          .finally(_ => historyBackPromise(t, scenario));
+      }, "`Referer` header with length < 4k is not stripped to an origin.");
+
+      promise_test(t => {
+        history.pushState(null, null, "/");
+        history.replaceState(null, null, "A".repeat(4096 - location.href.length));
+        return invokeScenario(scenario)
+          .then(result => checkResult(scenario.expectation, result))
+          .finally(_ => historyBackPromise(t, scenario));
+      }, "`Referer` header with length == 4k is not stripped to an origin.");
+
+      promise_test(t => {
+        history.pushState(null, null, "/");
+        history.replaceState(null, null, "A".repeat(4096 - location.href.length + 1));
+        return invokeScenario(scenario)
+          .then(result => checkResult("origin", result))
+          .finally(_ => historyBackPromise(t, scenario));
+      }, "`Referer` header with length > 4k is stripped to an origin.");
+    }
+  }
+
+  return {start: runTest};
+}
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/tools/generate.py b/tests/wpt/web-platform-tests/referrer-policy/generic/tools/generate.py
index ba1e963787b..480603b9bd8 100755
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/tools/generate.py
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/tools/generate.py
@@ -13,30 +13,25 @@ import generate
 
 class ReferrerPolicyConfig(object):
     def __init__(self):
-        self.selection_pattern = '%(delivery_type)s/' + \
-                                 '%(origin)s/' + \
-                                 '%(source_scheme)s/' + \
-                                 '%(subresource)s/' + \
-                                 '%(redirection)s/'
+        self.selection_pattern = \
+              '%(source_context_list)s.%(delivery_type)s/' + \
+              '%(delivery_value)s/' + \
+              '%(subresource)s/' + \
+              '%(origin)s.%(redirection)s.%(source_scheme)s'
 
-        self.test_file_path_pattern = '%(spec_name)s/' + self.selection_pattern + \
-                                      '%(name)s.%(source_scheme)s.html'
+        self.test_file_path_pattern = 'gen/' + self.selection_pattern + '.html'
 
-        self.test_description_template = '''The referrer URL is %(expectation)s when a
-document served over %(source_scheme)s requires a
-sub-resource via %(subresource)s using the %(delivery_type)s
-delivery method with %(redirection)s and when
-the target request is %(origin)s.'''
+        self.test_description_template = 'Referrer Policy: Expects %(expectation)s for %(subresource)s to %(origin)s origin and %(redirection)s redirection from %(source_scheme)s context.'
 
         self.test_page_title_template = 'Referrer-Policy: %s'
 
-        self.helper_js = '/referrer-policy/generic/referrer-policy-test-case.sub.js'
+        self.helper_js = '/referrer-policy/generic/test-case.sub.js'
 
         # For debug target only.
         self.sanity_checker_js = '/referrer-policy/generic/sanity-checker.js'
         self.spec_json_js = '/referrer-policy/spec_json.js'
 
-        self.test_case_name = 'ReferrerPolicyTestCase'
+        self.test_case_name = 'TestCase'
 
         script_directory = os.path.dirname(os.path.abspath(__file__))
         self.spec_directory = os.path.abspath(
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
deleted file mode 100644
index 8b77fb75247..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 3e921ee2051..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index c7821aae3f6..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index bae8956bf7d..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index c418c5a2714..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index d8c7a5467c5..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 437a2c703c0..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 5887e73ae7a..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index e320e6191b6..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index fc100af0081..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index c9810465b2c..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 71c95f870ff..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 9fe5ef8a619..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 0901c1bc1f6..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 3f3bcb557ef..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 51adeac1f15..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 97c8b34e5fb..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 67241ce4616..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index f60094da322..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 183e4dd4367..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 5a3b4486d82..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 6144b6e19ba..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 4fe4fe8bc0d..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 0ed931f885d..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 9be57e4a592..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 2df7c747290..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 75d4b9fbe19..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 2a9392df1d6..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 028ee939474..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 66e42d84e1b..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 7e988ffbc8e..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 335fde0034b..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 3ab4e9b33a7..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index c8946d88a00..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index e79e8a05742..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index cc5ea2700e1..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 759625f622c..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 34c39041f99..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 9301f0b2719..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 7b9a33f47e4..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 3303e355a48..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 932ac4e18f9..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 32dac4bf4fa..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 88a6f0b3283..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 0caca74b53d..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index f6215762acb..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 35123332a8a..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 757b06bc6ac..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 3044b007cd9..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 2f61fa770d7..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index fbbb9efd933..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 8a6ba540eea..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index de595abdeda..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 07a1ddc3a02..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 47c96588dbf..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index e047b17d411..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 404e18bd654..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 246db457035..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 0a2a0f026c6..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index b35d8f7f4f1..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index aee79e7279e..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index e1ae930f78b..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 5e871b80659..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index c606d407a3d..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index bb9ccab8126..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 4544ade5134..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index f2152da955f..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 7205b5b5e20..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 2bd7f7f9f96..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 6c941b98aff..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 78a12c0faf7..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 8cb3b1da63c..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 98b574b0334..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 85b47db7c49..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index e2b6315eed7..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 8cd18a658d0..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index db8b65c9070..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index b37fab1c7d1..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index a8967e2f007..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 1a7931b1016..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 7c80c012b34..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 221dfb63ef9..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 6373a785fc2..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 20f91bbeb1d..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index c20b8e0eff6..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index e6f1a3e27c8..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 4737eb59404..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 41018d5e2c0..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index adc9f952d66..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 2210516aeca..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 43fab7d5701..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 1f280d02fb4..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 603daa98f17..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 6ce64e62d24..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 93075883216..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index ef700be7505..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 070e6a8817d..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index f75b72157f4..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index f6367edbb22..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index c603a42b7c5..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 6d303558e7a..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 4436fc516bc..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 20047defd66..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 966abff838d..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index c6ee143fc88..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 7e239d69aff..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 31c3b79a581..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 6eed03783b2..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 61a5e51e637..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 7699f0f96b6..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 12f4286f8d8..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index e44a4fc096e..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 6a338aa72ce..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 5c81707fb55..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 90c65ae6e87..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index ee71a0d6f04..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index efe2c0d2f95..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 83ca9017551..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index c902ffc410f..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 7bfc7656576..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index c85180f01e1..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index c5726ef3701..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index a851d5bd818..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 54e6d020281..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 8250944c36f..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index df0fe535c15..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index e56f9107aae..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index a47e2e0c615..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 3dd2c1247dc..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 256db1aa584..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 7c05f53f14f..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 83a91abf2bd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 461fce61eef..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 9d5a65e3171..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 26912186351..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index d67f6bdbfba..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index bfd73c92dc6..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 4b61d4478a5..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index eb4e0b3414d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 7ebd1199cc1..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 45675268814..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index fecf19ce75a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 8a07db8736e..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index ab0b3501c39..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 3493ca250b8..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index fe714d038bc..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 82002683fc9..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index f84861f792a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 8482c8ae977..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 48168636f42..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index aa3455bc2df..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index ed2159b6473..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 4495c5440cb..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index eb067ac7967..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 72b43aa9936..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index d2cf0366dca..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 34d467754d9..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 637b156a282..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index ad34824d58d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index f89a079a552..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 40e0fd0a810..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index a8d3c3ed2b6..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index df047a0ff44..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 6454292d6f0..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 9a9c91976d8..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index fedae8b7f7b..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 31892705e0f..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index c3981366c5d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index daf2637065f..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index eb5e616ecd6..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index abbf8fcb914..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index b5f28d2d671..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index e40426f78a8..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index a4bd83ad284..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 6696fba26b3..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index fbb4fa45f7d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 35af16f4dca..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 0c1af722041..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index d2bc6fd4842..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 7cdfc9bd414..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 6a1d773f91b..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 47c4a60aed7..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 9e95ed2ef1b..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 2a897d97add..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 507432c9db1..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 1a6cf6884b9..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 2b7beb3a4bb..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 43df09f493c..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 346c0165cf2..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 9c19546b28b..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index dc74b170064..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 0726049eefc..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 93b5b91c161..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 6b094f9b36e..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index fa473268c6d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 2f8afbe8aed..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 65cafa2b4f9..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 21a26882771..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index ce35564bf9d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 47aaeb0646d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 1e3252924fe..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index e09bacfa6fd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index ec641955cab..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 298ed876f0a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index c80d5bfd080..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 6b4d7aaf3d0..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 02f1cec108a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 3ab475dd62f..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 180cf23b63f..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index fb63204561f..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 856c6e24e13..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 1fdff5963da..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 05c28a5475d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index c60ecc104a8..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 8d81edd0440..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index a5a728cf86b..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index df4f87235d0..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 2ce35a6ee3c..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index bde8e0f0d13..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 6b5ea62e345..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index b39c40d1698..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index ba4fe78409f..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 9b6574020c6..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 544426d28c6..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 833d0f69136..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 55709bb0db2..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index a4919c0f7dc..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 9da55918ae3..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 9884fb1f072..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 5a27c133476..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 915801c177d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 504092c875f..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index f128c96d648..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 9ffd13b1c9f..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index c3bc40e34b8..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 6219c76898f..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 3a2ea609daa..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index c9bd5781db9..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 28239d6b595..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index cabb0193e6d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 22147bafb08..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 3d02acfc5f9..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 4fc0a20ca2a..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 46ca3525e66..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 6367857969a..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index dc266208a24..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index ae9a1a24c96..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 3b0e4d177d7..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index fd2db5728fc..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index b900db726c2..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 62acabf41c5..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index ba056619102..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index d86a85b208d..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index a5940fd6d94..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index e53a0ed387a..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index ebba94e987d..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 8ddd1581839..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 3740814c441..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 461c255ec90..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index f8cecd0d791..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index e1b46f72b9d..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 010656cfb05..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 0feafdce56e..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index a72089286fb..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index db330329909..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 47e98f19d00..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index ddf8b522b59..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 17f72f72702..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 4dbd0d1e8c5..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 01b339b41d2..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 07a972315fc..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index befe72d9695..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index b2eca76078f..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 50768c30cf4..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 8fae2caef61..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 4a41087b095..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index b6a898c1ad2..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index a26f0dd202e..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 8b178d9990c..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 0a46c97106b..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index cc92566b86d..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 99927886521..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index a7d6c72f08c..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index c4df370a717..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 8c45a5dac20..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index bd13da2a292..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 3c53fa01167..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index ec3e284c3c5..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index e6854db2f3d..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 526c2648432..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index bbf21e785f3..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 9cef48221ac..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 4b59071d48b..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 0a8ce7cfe01..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 09f21bf5294..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 53229010cfd..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 6a53bb812b3..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index dd27004c1c4..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 131c0e0893a..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 61753d6188a..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index e3cd0610003..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 6c8a0fd643d..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 5c6d59f53ec..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 4ccf6b24c82..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 07887aa6a61..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index a226cfc9422..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 9d2cb261d6e..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index f95a61709ba..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index e5c4a5b9d70..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 6b69d4f3399..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index b36d8e43696..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index cb22d1880e1..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 10c4f953428..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 9087f457aa7..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index cfbb2478acd..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 562bc513b1b..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 2aa2cdd9b4c..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 92b2a2069cf..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 9703cae9306..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 8f5342fc17a..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index c4f1a54f2c6..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 1b961e3dfb4..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 137aa7e3af8..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 1703a958e78..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index c3c98c4d440..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index c1c349086bc..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index a796ddbddc4..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index cd2d7972f0d..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 592768a121e..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 7824367f87b..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 7f07485e08e..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 8d8aa7b1407..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 585c54a5b78..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 53e908467c8..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 48e6c69b555..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index aa3dda32d62..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index d319c671e1f..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 2127ef3ada6..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index cfb23ead044..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 57db10fef10..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index e854d09454f..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 58993fbddb9..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 58588cbd89f..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 57abce25ec0..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 73a9963f1f0..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index e5d89fb2d20..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index f69d366a327..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index ee0f051f770..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index ec455a6aef7..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index dc2c9d9ab75..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 9fbc08e5384..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 3f46fabe37b..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 3ca5a0b0d7c..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index a17b3ba8c17..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index fda77dbd15b..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index fb2ae653afe..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 13669d31a69..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 0f8985d1427..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 26434dd0a05..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 62e3849d679..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 6a09e53315a..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 5577dd290e8..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 3dfd7e3526c..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 5fbda64f1df..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index b498a7d7a31..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index cf30937880f..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 5123048a961..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 1a6b8711327..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 6ecead7d50e..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index abaf6d3efb8..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 849754d0a23..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index c9009ba9bb4..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index e10011d34f1..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 3a8045104ba..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 7e4275cad39..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 130958a292a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 35fa4d4e120..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 8bbdbcaf518..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index f765d8e5ed4..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 81abd80a316..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index dce1889cdaf..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 2d300936294..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 7490ce2006c..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index efa72adcc59..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 6c5960010bb..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index c3f9f1540c8..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 972258f7c09..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index a0b43f146fc..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index e4b8632fdcd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index f01ce4e0289..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index f0d6a0fd054..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index f62fcf98e40..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index c6c6a1e4837..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index b74b0d48002..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index e18a7d6a716..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 792f0231e44..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index a3d13d7ef6b..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index e4dc43e104e..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index fcc9e44e29c..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 41d15b0fcde..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 8f54379c868..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index fabac2224ef..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 9635d1c76c6..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index b825d86ed65..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index a8231d341c6..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index ac410b09142..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 53d23827867..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 35418f29644..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 4d62a43436b..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index ae89a6a0880..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 06c3b88fb1c..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 237a5f0f491..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index ec9ed5db268..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 545d5215b80..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 0a8b8a98c18..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index a4efc8f4d6b..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 5ff897669a4..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 51d8fd3ede2..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index bf13e92fa48..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index d1fddfb6a42..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index cbdc2336ada..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 8563ebfd9fe..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 6365a8bcf02..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 35002016c5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 0f0d047fffa..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 4c9cd6fdaa1..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index d9787a4e6d5..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index a150b8ea76d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index e1c0b2a5b5a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 8dc5fd5aa9a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index f74e8d3cbd5..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 71d01012864..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index c5e42caa8ba..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index f9673638209..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index d4306b79349..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 0b0ff184b64..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 414c8723ca1..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index ba53dcf3508..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 0525b3cd2ee..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 35b705119f7..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index d5908e7ba78..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 3be90e5d4ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index d64247c6447..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index f9769b95f9f..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 7c9b8c83221..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 2385c83cab9..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index bfe81dde602..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index c4305ba0bc8..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 7d89052f52f..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 738ef6b1996..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index f34d5494e7d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 3209281673b..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index e5d16e24a55..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 8009f57b1ee..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index b702eef57fc..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index b97825de1e0..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 5c73dd4d88d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index aa9af02fe1e..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 43f41479755..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index cd10ed2b6b5..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index a1538cc41be..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 4fc2718a910..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 2ffaea9826c..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index c997e228e17..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 2872d59fc51..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index dc7222d3732..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index a2c953d6e74..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 2bf98b82119..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 0af634a6d27..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 57d8f47d4f2..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 47870a7628e..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 3d1253229e3..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 8c0a1ec4eb7..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index eaf45d6f7a5..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 9eaefdaf1ec..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 413e8ad82a1..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 2832c088422..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 78773bd5e71..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 3cd75589c30..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index cbccc42abda..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index ccd15b3bbfc..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index cca4a0ceb6e..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 8bf793b5b86..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 7c0a9b9bc60..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 9c2b85af9b3..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 96bc005ebf9..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 4e35615bf1b..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index b78a720df68..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 7d5905ba238..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 5a8e1fd812c..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index f4a53c631d5..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index d6b14df4795..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index b5daa974365..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 7fdc05de8d6..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index c5b705bef4b..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 926ed948d51..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index b1d5c24fdad..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 29efe5be1eb..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 79b406bb6ef..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 553334e038b..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index c23a6cdf198..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 7dbb28b150e..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 0f8c2d41b9a..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 85236c6263d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 26767fab0b3..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 2c98ba5babf..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 3a4e85ec7e6..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 7b0b4552057..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 274f04abe69..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index dc7dfebee06..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index b2d25b69e30..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 622f77bde2d..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index dab704a425d..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 878d948ceb3..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 603ecc55779..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 43a132e6808..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 1bd76067b27..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index d00194b1437..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 2daad670867..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 1cda061aa01..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 735a4acbdf6..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 19e5416cb3f..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index e45cbc673ae..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 4539d076c49..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 7f3e435f11a..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 81607785f9a..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index a8a6aa1d828..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index f1eba7aacdc..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 7ab09331785..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 29ba286e378..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 0d1b267039a..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index dd07624a999..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 38df795e3a5..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 525df39fd4b..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index a4533c649ae..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 037bb3fee46..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 7671fa5c539..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 085a267a574..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index cc554724b30..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 011ffcd01eb..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 3f7d38759e9..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index f66e36d7a9b..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index e10c1066d64..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index e50f65e16b9..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 5b5dd12e596..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index ebc18c61cdc..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 06becc108f4..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 88a7cddb0b0..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index ebd68284221..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index df69d477669..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index eda910d0922..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 37370379123..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 56e124b1470..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 2d1110639e0..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 22fe64a0945..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index f81dd12dc60..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 484d9ec036f..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index e566233091f..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index f68dac93582..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 7ffc2824a8b..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 0834f026a39..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 51d538a7502..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 09e9945924b..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index ebd39b1026f..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 3cefbeb1b7d..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 1f883558c63..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index d705e0ad324..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 1dc4c4cd4d1..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 1c28100003e..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 8abb5198b86..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 9d4630b46c5..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 58e0f26e2f8..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index f47b1f37046..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index b45744a94ea..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index d2061267c24..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 5f35a68ef06..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index e9787edaecc..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index e00a911d55a..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 699e73a837f..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index fd369ed2ec5..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 426a91f7370..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 18250c8c3d9..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 019debb40a5..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/spec.src.json b/tests/wpt/web-platform-tests/referrer-policy/spec.src.json
index f69c289526a..ab02dcc1b16 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/spec.src.json
+++ b/tests/wpt/web-platform-tests/referrer-policy/spec.src.json
@@ -10,6 +10,7 @@
           "name": "insecure-protocol",
           "expansion": "default",
           "source_scheme": "http",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": null,
           "redirection": "*",
@@ -24,6 +25,7 @@
           "name": "upgrade-protocol",
           "expansion": "default",
           "source_scheme": "http",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": null,
           "redirection": "*",
@@ -38,6 +40,7 @@
           "name": "downgrade-protocol",
           "expansion": "default",
           "source_scheme": "https",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": null,
           "redirection": "*",
@@ -52,6 +55,7 @@
           "name": "secure-protocol",
           "expansion": "default",
           "source_scheme": "https",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": null,
           "redirection": "*",
@@ -74,6 +78,7 @@
           "name": "generic",
           "expansion": "default",
           "source_scheme": "*",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "no-referrer",
           "redirection": "*",
@@ -93,6 +98,7 @@
           "name": "insecure-protocol",
           "expansion": "default",
           "source_scheme": "http",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "no-referrer-when-downgrade",
           "redirection": "*",
@@ -107,6 +113,7 @@
           "name": "upgrade-protocol",
           "expansion": "default",
           "source_scheme": "http",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "no-referrer-when-downgrade",
           "redirection": "*",
@@ -121,6 +128,7 @@
           "name": "downgrade-protocol",
           "expansion": "default",
           "source_scheme": "https",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "no-referrer-when-downgrade",
           "redirection": "*",
@@ -135,6 +143,7 @@
           "name": "secure-protocol",
           "expansion": "default",
           "source_scheme": "https",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "no-referrer-when-downgrade",
           "redirection": "*",
@@ -157,6 +166,7 @@
           "name": "generic",
           "expansion": "default",
           "source_scheme": "*",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "origin",
           "redirection": "*",
@@ -176,6 +186,7 @@
           "name": "same-origin-insecure",
           "expansion": "default",
           "source_scheme": "http",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "same-origin",
           "redirection": "*",
@@ -187,6 +198,7 @@
           "name": "same-origin-secure-default",
           "expansion": "default",
           "source_scheme": "https",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "same-origin",
           "redirection": "*",
@@ -198,6 +210,7 @@
           "name": "same-origin-insecure",
           "expansion": "override",
           "source_scheme": "*",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "same-origin",
           "redirection": "swap-origin",
@@ -212,6 +225,7 @@
           "name": "cross-origin",
           "expansion": "default",
           "source_scheme": "*",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "same-origin",
           "redirection": "*",
@@ -234,6 +248,7 @@
           "name": "same-origin-insecure",
           "expansion": "default",
           "source_scheme": "http",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "origin-when-cross-origin",
           "redirection": "*",
@@ -245,6 +260,7 @@
           "name": "same-origin-secure-default",
           "expansion": "default",
           "source_scheme": "https",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "origin-when-cross-origin",
           "redirection": "*",
@@ -256,6 +272,7 @@
           "name": "same-origin-upgrade",
           "expansion": "default",
           "source_scheme": "http",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "origin-when-cross-origin",
           "redirection": "*",
@@ -267,6 +284,7 @@
           "name": "same-origin-downgrade",
           "expansion": "default",
           "source_scheme": "https",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "origin-when-cross-origin",
           "redirection": "*",
@@ -278,6 +296,7 @@
           "name": "same-origin-insecure",
           "expansion": "override",
           "source_scheme": "*",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "origin-when-cross-origin",
           "redirection": "swap-origin",
@@ -292,6 +311,7 @@
           "name": "cross-origin",
           "expansion": "default",
           "source_scheme": "*",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "origin-when-cross-origin",
           "redirection": "*",
@@ -314,6 +334,7 @@
           "name": "insecure-protocol",
           "expansion": "default",
           "source_scheme": "http",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "strict-origin",
           "redirection": "*",
@@ -328,6 +349,7 @@
           "name": "upgrade-protocol",
           "expansion": "default",
           "source_scheme": "http",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "strict-origin",
           "redirection": "*",
@@ -342,6 +364,7 @@
           "name": "downgrade-protocol",
           "expansion": "default",
           "source_scheme": "https",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "strict-origin",
           "redirection": "*",
@@ -356,6 +379,7 @@
           "name": "secure-protocol",
           "expansion": "default",
           "source_scheme": "https",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "strict-origin",
           "redirection": "*",
@@ -378,6 +402,7 @@
           "name": "same-insecure",
           "expansion": "default",
           "source_scheme": "http",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "strict-origin-when-cross-origin",
           "redirection": "*",
@@ -389,6 +414,7 @@
           "name": "same-insecure",
           "expansion": "override",
           "source_scheme": "http",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "strict-origin-when-cross-origin",
           "redirection": "swap-origin",
@@ -400,6 +426,7 @@
           "name": "cross-insecure",
           "expansion": "default",
           "source_scheme": "http",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "strict-origin-when-cross-origin",
           "redirection": "*",
@@ -411,6 +438,7 @@
           "name": "upgrade-protocol",
           "expansion": "default",
           "source_scheme": "http",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "strict-origin-when-cross-origin",
           "redirection": "*",
@@ -425,6 +453,7 @@
           "name": "downgrade-protocol",
           "expansion": "default",
           "source_scheme": "https",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "strict-origin-when-cross-origin",
           "redirection": "*",
@@ -439,6 +468,7 @@
           "name": "same-secure",
           "expansion": "default",
           "source_scheme": "https",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "strict-origin-when-cross-origin",
           "redirection": "*",
@@ -450,6 +480,7 @@
           "name": "same-secure",
           "expansion": "override",
           "source_scheme": "https",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "strict-origin-when-cross-origin",
           "redirection": "swap-origin",
@@ -461,6 +492,7 @@
           "name": "cross-secure",
           "expansion": "default",
           "source_scheme": "https",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "strict-origin-when-cross-origin",
           "redirection": "*",
@@ -480,6 +512,7 @@
           "name": "generic",
           "expansion": "default",
           "source_scheme": "*",
+          "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": "unsafe-url",
           "redirection": "*",
@@ -496,6 +529,7 @@
       "name": "cross-origin-workers",
       "expansion": "*",
       "source_scheme": "*",
+      "source_context_list": "*",
       "redirection": "*",
       "delivery_type": "*",
       "delivery_value": "*",
@@ -504,9 +538,9 @@
         "cross-https"
       ],
       "subresource": [
-        "worker-request",
-        "module-worker",
-        "shared-worker"
+        "worker-classic",
+        "worker-module",
+        "sharedworker-classic"
       ],
       "expectation": "*"
     },
@@ -514,6 +548,7 @@
       "name": "upgraded-protocol-workers",
       "expansion": "*",
       "source_scheme": "http",
+      "source_context_list": "*",
       "delivery_type": "*",
       "delivery_value": "*",
       "redirection": "*",
@@ -522,9 +557,9 @@
         "cross-https"
       ],
       "subresource": [
-        "worker-request",
-        "module-worker",
-        "shared-worker"
+        "worker-classic",
+        "worker-module",
+        "sharedworker-classic"
       ],
       "expectation": "*"
     },
@@ -532,6 +567,7 @@
       "name": "mixed-content-insecure-subresources",
       "expansion": "*",
       "source_scheme": "https",
+      "source_context_list": "*",
       "delivery_type": "*",
       "delivery_value": "*",
       "redirection": "*",
@@ -546,6 +582,7 @@
       "name": "area-tag",
       "expansion": "*",
       "source_scheme": "*",
+      "source_context_list": "*",
       "delivery_type": "*",
       "delivery_value": "*",
       "redirection": "*",
@@ -557,14 +594,15 @@
       "name": "worker-requests-with-swap-origin-redirect",
       "expansion": "*",
       "source_scheme": "*",
+      "source_context_list": "*",
       "delivery_type": "*",
       "delivery_value": "*",
       "redirection": "swap-origin",
       "origin": "*",
       "subresource": [
-        "worker-request",
-        "module-worker",
-        "shared-worker"
+        "worker-classic",
+        "worker-module",
+        "sharedworker-classic"
       ],
       "expectation": "*"
     },
@@ -572,6 +610,7 @@
       "name": "overhead-for-redirection",
       "expansion": "*",
       "source_scheme": "*",
+      "source_context_list": "*",
       "delivery_type": "*",
       "delivery_value": "*",
       "redirection": [
@@ -589,6 +628,7 @@
       "name": "source-https-unsupported-by-web-platform-tests-runners",
       "expansion": "*",
       "source_scheme": "https",
+      "source_context_list": "*",
       "delivery_type": "*",
       "delivery_value": "*",
       "redirection": "*",
@@ -600,6 +640,7 @@
       "name": "<link rel=noreferrer>'s delivery_value should be no-referrer",
       "expansion": "*",
       "source_scheme": "*",
+      "source_context_list": "*",
       "delivery_type": "rel-noref",
       "delivery_value": [
         null,
@@ -617,6 +658,226 @@
       "expectation": "*"
     }
   ],
+  "source_context_schema": {
+    "supported_delivery_type": {
+      "top": [
+        "meta",
+        "http-rp"
+      ],
+      "iframe": [
+        "meta",
+        "http-rp"
+      ],
+      "srcdoc": [
+        "meta"
+      ],
+      "worker-classic": [
+        "http-rp"
+      ],
+      "worker-module": [
+        "http-rp"
+      ],
+      "worker-classic-data": [],
+      "worker-module-data": []
+    },
+    "supported_subresource": {
+      "top": "*",
+      "iframe": "*",
+      "srcdoc": "*",
+      "worker-classic": [
+        "xhr",
+        "fetch",
+        "worker-classic",
+        "worker-module"
+      ],
+      "worker-module": [
+        "xhr",
+        "fetch",
+        "worker-classic",
+        "worker-module"
+      ],
+      "worker-classic-data": [
+        "xhr",
+        "fetch"
+      ],
+      "worker-module-data": [
+        "xhr",
+        "fetch"
+      ]
+    }
+  },
+  "subresource_schema": {
+    "supported_delivery_type": {
+      "iframe-tag": [
+        "attr"
+      ],
+      "img-tag": [
+        "attr"
+      ],
+      "script-tag": [
+        "attr"
+      ],
+      "a-tag": [
+        "attr",
+        "rel-noref"
+      ],
+      "area-tag": [
+        "attr"
+      ],
+      "xhr": [],
+      "fetch": [],
+      "worker-module": [],
+      "sharedworker-classic": [],
+      "worker-classic": []
+    }
+  },
+  "source_context_list_schema": {
+    "top": {
+      "description": "Policy set by the top-level Document",
+      "sourceContextList": [
+        {
+          "sourceContextType": "top",
+          "policyDeliveries": [
+            "policy"
+          ]
+        }
+      ],
+      "subresourcePolicyDeliveries": []
+    },
+    "req": {
+      "description": "Subresource request's policy should override Document's policy",
+      "sourceContextList": [
+        {
+          "sourceContextType": "top",
+          "policyDeliveries": [
+            "anotherPolicy"
+          ]
+        }
+      ],
+      "subresourcePolicyDeliveries": [
+        "nonNullPolicy"
+      ]
+    },
+    "srcdoc-inherit": {
+      "description": "srcdoc iframe should inherit parent Document's policy",
+      "sourceContextList": [
+        {
+          "sourceContextType": "top",
+          "policyDeliveries": [
+            "policy"
+          ]
+        },
+        {
+          "sourceContextType": "srcdoc"
+        }
+      ],
+      "subresourcePolicyDeliveries": []
+    },
+    "srcdoc": {
+      "description": "srcdoc iframe's policy should override parent Document's policy",
+      "sourceContextList": [
+        {
+          "sourceContextType": "top",
+          "policyDeliveries": [
+            "anotherPolicy"
+          ]
+        },
+        {
+          "sourceContextType": "srcdoc",
+          "policyDeliveries": [
+            "nonNullPolicy"
+          ]
+        }
+      ],
+      "subresourcePolicyDeliveries": []
+    },
+    "iframe": {
+      "description": "external iframe's policy should override parent Document's policy",
+      "sourceContextList": [
+        {
+          "sourceContextType": "top",
+          "policyDeliveries": [
+            "anotherPolicy"
+          ]
+        },
+        {
+          "sourceContextType": "iframe",
+          "policyDeliveries": [
+            "policy"
+          ]
+        }
+      ],
+      "subresourcePolicyDeliveries": []
+    },
+    "worker-classic": {
+      "sourceContextList": [
+        {
+          "sourceContextType": "top",
+          "policyDeliveries": [
+            "anotherPolicy"
+          ]
+        },
+        {
+          "sourceContextType": "worker-classic",
+          "policyDeliveries": [
+            "policy"
+          ]
+        }
+      ],
+      "subresourcePolicyDeliveries": []
+    },
+    "worker-classic-data": {
+      "sourceContextList": [
+        {
+          "sourceContextType": "top",
+          "policyDeliveries": [
+            "anotherPolicy"
+          ]
+        },
+        {
+          "sourceContextType": "worker-classic-data",
+          "policyDeliveries": [
+            "policy"
+          ]
+        }
+      ],
+      "subresourcePolicyDeliveries": []
+    },
+    "worker-module": {
+      "sourceContextList": [
+        {
+          "sourceContextType": "top",
+          "policyDeliveries": [
+            "anotherPolicy"
+          ]
+        },
+        {
+          "sourceContextType": "worker-module",
+          "policyDeliveries": [
+            "policy"
+          ]
+        }
+      ],
+      "subresourcePolicyDeliveries": []
+    },
+    "worker-module-data": {
+      "sourceContextList": [
+        {
+          "sourceContextType": "top",
+          "policyDeliveries": [
+            "anotherPolicy"
+          ]
+        },
+        {
+          "sourceContextType": "worker-module-data",
+          "policyDeliveries": [
+            "policy"
+          ]
+        }
+      ],
+      "subresourcePolicyDeliveries": []
+    }
+  },
   "test_expansion_schema": {
     "expansion": [
       "default",
@@ -645,6 +906,17 @@
       "cross-http",
       "cross-https"
     ],
+    "source_context_list": [
+      "top",
+      "req",
+      "srcdoc-inherit",
+      "srcdoc",
+      "iframe",
+      "worker-classic",
+      "worker-classic-data",
+      "worker-module",
+      "worker-module-data"
+    ],
     "source_scheme": [
       "http",
       "https"
@@ -660,11 +932,11 @@
       "script-tag",
       "a-tag",
       "area-tag",
-      "xhr-request",
-      "worker-request",
-      "module-worker",
-      "shared-worker",
-      "fetch-request"
+      "xhr",
+      "worker-classic",
+      "worker-module",
+      "sharedworker-classic",
+      "fetch"
     ],
     "expectation": [
       "omitted",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/spec_json.js b/tests/wpt/web-platform-tests/referrer-policy/spec_json.js
index 346a6218f9e..1b507dbcf14 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/spec_json.js
+++ b/tests/wpt/web-platform-tests/referrer-policy/spec_json.js
@@ -1 +1 @@
-var SPEC_JSON = {"test_expansion_schema": {"origin": ["same-origin", "cross-origin"], "subresource": ["iframe-tag", "img-tag", "script-tag", "a-tag", "area-tag", "xhr-request", "worker-request", "module-worker", "shared-worker", "fetch-request"], "target_protocol": ["http", "https"], "expansion": ["default", "override"], "delivery_method": ["http-rp", "meta-referrer", "attr-referrer", "rel-noreferrer"], "redirection": ["no-redirect", "keep-origin-redirect", "swap-origin-redirect"], "referrer_url": ["omitted", "origin", "stripped-referrer"], "source_protocol": ["http", "https"]}, "specification": [{"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policies", "referrer_policy": null, "title": "Referrer Policy is not explicitly defined", "test_expansion": [{"origin": "*", "name": "insecure-protocol", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "upgrade-protocol", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "downgrade-protocol", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "omitted", "source_protocol": "https", "subresource": "*"}, {"origin": "*", "name": "secure-protocol", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "https", "subresource": "*"}], "name": "unset-referrer-policy", "description": "Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer", "referrer_policy": "no-referrer", "title": "Referrer Policy is set to 'no-referrer'", "test_expansion": [{"origin": "*", "name": "generic", "target_protocol": "*", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "omitted", "source_protocol": "*", "subresource": "*"}], "name": "no-referrer", "description": "Check that sub-resource never gets the referrer URL."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade", "referrer_policy": "no-referrer-when-downgrade", "title": "Referrer Policy is set to 'no-referrer-when-downgrade'", "test_expansion": [{"origin": "*", "name": "insecure-protocol", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "upgrade-protocol", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "downgrade-protocol", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "omitted", "source_protocol": "https", "subresource": "*"}, {"origin": "*", "name": "secure-protocol", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "https", "subresource": "*"}], "name": "no-referrer-when-downgrade", "description": "Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin", "referrer_policy": "origin", "title": "Referrer Policy is set to 'origin'", "test_expansion": [{"origin": "*", "name": "generic", "target_protocol": "*", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "*", "subresource": "*"}], "name": "origin", "description": "Check that all subresources in all casses get only the origin portion of the referrer URL."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin", "referrer_policy": "same-origin", "title": "Referrer Policy is set to 'same-origin'", "test_expansion": [{"origin": "same-origin", "name": "same-origin-insecure", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-secure-default", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "https", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-insecure", "target_protocol": "*", "expansion": "override", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "swap-origin-redirect", "referrer_url": "omitted", "source_protocol": "*", "subresource": "*"}, {"origin": "cross-origin", "name": "cross-origin", "target_protocol": "*", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "omitted", "source_protocol": "*", "subresource": "*"}], "name": "same-origin", "description": "Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin", "referrer_policy": "origin-when-cross-origin", "title": "Referrer Policy is set to 'origin-when-cross-origin'", "test_expansion": [{"origin": "same-origin", "name": "same-origin-insecure", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-secure-default", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "https", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-upgrade", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "http", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-downgrade", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "https", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-insecure", "target_protocol": "*", "expansion": "override", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "swap-origin-redirect", "referrer_url": "origin", "source_protocol": "*", "subresource": "*"}, {"origin": "cross-origin", "name": "cross-origin", "target_protocol": "*", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "*", "subresource": "*"}], "name": "origin-when-cross-origin", "description": "Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin", "referrer_policy": "strict-origin", "title": "Referrer Policy is set to 'strict-origin'", "test_expansion": [{"origin": "*", "name": "insecure-protocol", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "upgrade-protocol", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "downgrade-protocol", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "omitted", "source_protocol": "https", "subresource": "*"}, {"origin": "*", "name": "secure-protocol", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "https", "subresource": "*"}], "name": "strict-origin", "description": "Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin", "referrer_policy": "strict-origin-when-cross-origin", "title": "Referrer Policy is set to 'strict-origin-when-cross-origin'", "test_expansion": [{"origin": "same-origin", "name": "same-insecure", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "same-origin", "name": "same-insecure", "target_protocol": "http", "expansion": "override", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "swap-origin-redirect", "referrer_url": "origin", "source_protocol": "http", "subresource": "*"}, {"origin": "cross-origin", "name": "cross-insecure", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "upgrade-protocol", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "downgrade-protocol", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "omitted", "source_protocol": "https", "subresource": "*"}, {"origin": "same-origin", "name": "same-secure", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "https", "subresource": "*"}, {"origin": "same-origin", "name": "same-secure", "target_protocol": "https", "expansion": "override", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "swap-origin-redirect", "referrer_url": "origin", "source_protocol": "https", "subresource": "*"}, {"origin": "cross-origin", "name": "cross-secure", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "https", "subresource": "*"}], "name": "strict-origin-when-cross-origin", "description": "Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url", "referrer_policy": "unsafe-url", "title": "Referrer Policy is set to 'unsafe-url'", "test_expansion": [{"origin": "*", "name": "generic", "target_protocol": "*", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "*", "subresource": "*"}], "name": "unsafe-url", "description": "Check that all sub-resources get the stripped referrer URL."}], "referrer_policy_schema": [null, "no-referrer", "no-referrer-when-downgrade", "same-origin", "origin", "origin-when-cross-origin", "strict-origin", "strict-origin-when-cross-origin", "unsafe-url"], "excluded_tests": [{"origin": "cross-origin", "name": "cross-origin-workers", "target_protocol": "*", "expansion": "*", "delivery_method": "*", "redirection": "*", "referrer_url": "*", "source_protocol": "*", "subresource": ["worker-request", "module-worker", "shared-worker"]}, {"origin": "*", "name": "upgraded-protocol-workers", "target_protocol": "https", "expansion": "*", "delivery_method": "*", "redirection": "*", "referrer_url": "*", "source_protocol": "http", "subresource": ["worker-request", "module-worker", "shared-worker"]}, {"origin": "*", "name": "mixed-content-insecure-subresources", "target_protocol": "http", "expansion": "*", "delivery_method": "*", "redirection": "*", "referrer_url": "*", "source_protocol": "https", "subresource": "*"}, {"origin": "*", "name": "elements-not-supporting-attr-referrer", "target_protocol": "*", "expansion": "*", "delivery_method": ["attr-referrer"], "redirection": "*", "referrer_url": "*", "source_protocol": "*", "subresource": ["xhr-request", "worker-request", "module-worker", "shared-worker", "fetch-request"]}, {"origin": "*", "name": "elements-not-supporting-rel-noreferrer", "target_protocol": "*", "expansion": "*", "delivery_method": ["rel-noreferrer"], "redirection": "*", "referrer_url": "*", "source_protocol": "*", "subresource": ["iframe-tag", "img-tag", "script-tag", "xhr-request", "worker-request", "module-worker", "shared-worker", "fetch-request", "area-tag"]}, {"origin": "*", "name": "area-tag", "target_protocol": "*", "expansion": "*", "delivery_method": "*", "redirection": "*", "referrer_url": "*", "source_protocol": "*", "subresource": "area-tag"}, {"origin": "*", "name": "worker-requests-with-swap-origin-redirect", "target_protocol": "*", "expansion": "*", "delivery_method": "*", "redirection": "swap-origin-redirect", "referrer_url": "*", "source_protocol": "*", "subresource": ["worker-request", "module-worker", "shared-worker"]}, {"origin": "*", "name": "overhead-for-redirection", "target_protocol": "*", "expansion": "*", "delivery_method": "*", "redirection": ["keep-origin-redirect", "swap-origin-redirect"], "referrer_url": "*", "source_protocol": "*", "subresource": ["a-tag", "area-tag"]}, {"origin": "*", "name": "source-https-unsupported-by-web-platform-tests-runners", "target_protocol": "*", "expansion": "*", "delivery_method": "*", "redirection": "*", "referrer_url": "*", "source_protocol": "https", "subresource": "*"}]};
+var SPEC_JSON = {"subresource_schema": {"supported_delivery_type": {"img-tag": ["attr"], "sharedworker-classic": [], "xhr": [], "a-tag": ["attr", "rel-noref"], "area-tag": ["attr"], "iframe-tag": ["attr"], "worker-module": [], "script-tag": ["attr"], "fetch": [], "worker-classic": []}}, "excluded_tests": [{"delivery_value": "*", "origin": ["cross-http", "cross-https"], "delivery_type": "*", "name": "cross-origin-workers", "expectation": "*", "expansion": "*", "redirection": "*", "source_context_list": "*", "source_scheme": "*", "subresource": ["worker-classic", "worker-module", "sharedworker-classic"]}, {"delivery_value": "*", "origin": ["same-https", "cross-https"], "delivery_type": "*", "name": "upgraded-protocol-workers", "expectation": "*", "expansion": "*", "redirection": "*", "source_context_list": "*", "source_scheme": "http", "subresource": ["worker-classic", "worker-module", "sharedworker-classic"]}, {"delivery_value": "*", "origin": ["same-http", "cross-http"], "delivery_type": "*", "name": "mixed-content-insecure-subresources", "expectation": "*", "expansion": "*", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": "*"}, {"delivery_value": "*", "origin": "*", "delivery_type": "*", "name": "area-tag", "expectation": "*", "expansion": "*", "redirection": "*", "source_context_list": "*", "source_scheme": "*", "subresource": "area-tag"}, {"delivery_value": "*", "origin": "*", "delivery_type": "*", "name": "worker-requests-with-swap-origin-redirect", "expectation": "*", "expansion": "*", "redirection": "swap-origin", "source_context_list": "*", "source_scheme": "*", "subresource": ["worker-classic", "worker-module", "sharedworker-classic"]}, {"delivery_value": "*", "origin": "*", "delivery_type": "*", "name": "overhead-for-redirection", "expectation": "*", "expansion": "*", "redirection": ["keep-origin", "swap-origin"], "source_context_list": "*", "source_scheme": "*", "subresource": ["a-tag", "area-tag"]}, {"delivery_value": "*", "origin": "*", "delivery_type": "*", "name": "source-https-unsupported-by-web-platform-tests-runners", "expectation": "*", "expansion": "*", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": "*"}, {"delivery_value": [null, "no-referrer-when-downgrade", "same-origin", "origin", "origin-when-cross-origin", "strict-origin", "strict-origin-when-cross-origin", "unsafe-url"], "origin": "*", "delivery_type": "rel-noref", "name": "<link rel=noreferrer>'s delivery_value should be no-referrer", "expectation": "*", "expansion": "*", "redirection": "*", "source_context_list": "*", "source_scheme": "*", "subresource": "*"}], "specification": [{"test_expansion": [{"delivery_value": null, "origin": ["same-http", "cross-http"], "delivery_type": "*", "name": "insecure-protocol", "expectation": "stripped-referrer", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "http", "subresource": "*"}, {"delivery_value": null, "origin": ["same-https", "cross-https"], "delivery_type": "*", "name": "upgrade-protocol", "expectation": "stripped-referrer", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "http", "subresource": "*"}, {"delivery_value": null, "origin": ["same-http", "cross-http"], "delivery_type": "*", "name": "downgrade-protocol", "expectation": "omitted", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": "*"}, {"delivery_value": null, "origin": ["same-https", "cross-https"], "delivery_type": "*", "name": "secure-protocol", "expectation": "stripped-referrer", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": "*"}], "description": "Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.", "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policies", "name": "unset-referrer-policy", "title": "Referrer Policy is not explicitly defined"}, {"test_expansion": [{"delivery_value": "no-referrer", "origin": "*", "delivery_type": "*", "name": "generic", "expectation": "omitted", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "*", "subresource": "*"}], "description": "Check that sub-resource never gets the referrer URL.", "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer", "name": "no-referrer", "title": "Referrer Policy is set to 'no-referrer'"}, {"test_expansion": [{"delivery_value": "no-referrer-when-downgrade", "origin": ["same-http", "cross-http"], "delivery_type": "*", "name": "insecure-protocol", "expectation": "stripped-referrer", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "http", "subresource": "*"}, {"delivery_value": "no-referrer-when-downgrade", "origin": ["same-https", "cross-https"], "delivery_type": "*", "name": "upgrade-protocol", "expectation": "stripped-referrer", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "http", "subresource": "*"}, {"delivery_value": "no-referrer-when-downgrade", "origin": ["same-http", "cross-http"], "delivery_type": "*", "name": "downgrade-protocol", "expectation": "omitted", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": "*"}, {"delivery_value": "no-referrer-when-downgrade", "origin": ["same-https", "cross-https"], "delivery_type": "*", "name": "secure-protocol", "expectation": "stripped-referrer", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": "*"}], "description": "Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.", "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade", "name": "no-referrer-when-downgrade", "title": "Referrer Policy is set to 'no-referrer-when-downgrade'"}, {"test_expansion": [{"delivery_value": "origin", "origin": "*", "delivery_type": "*", "name": "generic", "expectation": "origin", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "*", "subresource": "*"}], "description": "Check that all subresources in all casses get only the origin portion of the referrer URL.", "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin", "name": "origin", "title": "Referrer Policy is set to 'origin'"}, {"test_expansion": [{"delivery_value": "same-origin", "origin": "same-http", "delivery_type": "*", "name": "same-origin-insecure", "expectation": "stripped-referrer", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "http", "subresource": "*"}, {"delivery_value": "same-origin", "origin": "same-https", "delivery_type": "*", "name": "same-origin-secure-default", "expectation": "stripped-referrer", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": "*"}, {"delivery_value": "same-origin", "origin": ["same-http", "same-https"], "delivery_type": "*", "name": "same-origin-insecure", "expectation": "omitted", "expansion": "override", "redirection": "swap-origin", "source_context_list": "*", "source_scheme": "*", "subresource": "*"}, {"delivery_value": "same-origin", "origin": ["cross-http", "cross-https"], "delivery_type": "*", "name": "cross-origin", "expectation": "omitted", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "*", "subresource": "*"}], "description": "Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.", "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin", "name": "same-origin", "title": "Referrer Policy is set to 'same-origin'"}, {"test_expansion": [{"delivery_value": "origin-when-cross-origin", "origin": "same-http", "delivery_type": "*", "name": "same-origin-insecure", "expectation": "stripped-referrer", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "http", "subresource": "*"}, {"delivery_value": "origin-when-cross-origin", "origin": "same-https", "delivery_type": "*", "name": "same-origin-secure-default", "expectation": "stripped-referrer", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": "*"}, {"delivery_value": "origin-when-cross-origin", "origin": "same-https", "delivery_type": "*", "name": "same-origin-upgrade", "expectation": "origin", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "http", "subresource": "*"}, {"delivery_value": "origin-when-cross-origin", "origin": "same-http", "delivery_type": "*", "name": "same-origin-downgrade", "expectation": "origin", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": "*"}, {"delivery_value": "origin-when-cross-origin", "origin": ["same-http", "same-https"], "delivery_type": "*", "name": "same-origin-insecure", "expectation": "origin", "expansion": "override", "redirection": "swap-origin", "source_context_list": "*", "source_scheme": "*", "subresource": "*"}, {"delivery_value": "origin-when-cross-origin", "origin": ["cross-http", "cross-https"], "delivery_type": "*", "name": "cross-origin", "expectation": "origin", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "*", "subresource": "*"}], "description": "Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.", "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin", "name": "origin-when-cross-origin", "title": "Referrer Policy is set to 'origin-when-cross-origin'"}, {"test_expansion": [{"delivery_value": "strict-origin", "origin": ["same-http", "cross-http"], "delivery_type": "*", "name": "insecure-protocol", "expectation": "origin", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "http", "subresource": "*"}, {"delivery_value": "strict-origin", "origin": ["same-https", "cross-https"], "delivery_type": "*", "name": "upgrade-protocol", "expectation": "origin", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "http", "subresource": "*"}, {"delivery_value": "strict-origin", "origin": ["same-http", "cross-http"], "delivery_type": "*", "name": "downgrade-protocol", "expectation": "omitted", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": "*"}, {"delivery_value": "strict-origin", "origin": ["same-https", "cross-https"], "delivery_type": "*", "name": "secure-protocol", "expectation": "origin", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": "*"}], "description": "Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.", "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin", "name": "strict-origin", "title": "Referrer Policy is set to 'strict-origin'"}, {"test_expansion": [{"delivery_value": "strict-origin-when-cross-origin", "origin": "same-http", "delivery_type": "*", "name": "same-insecure", "expectation": "stripped-referrer", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "http", "subresource": "*"}, {"delivery_value": "strict-origin-when-cross-origin", "origin": "same-http", "delivery_type": "*", "name": "same-insecure", "expectation": "origin", "expansion": "override", "redirection": "swap-origin", "source_context_list": "*", "source_scheme": "http", "subresource": "*"}, {"delivery_value": "strict-origin-when-cross-origin", "origin": "cross-http", "delivery_type": "*", "name": "cross-insecure", "expectation": "origin", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "http", "subresource": "*"}, {"delivery_value": "strict-origin-when-cross-origin", "origin": ["same-https", "cross-https"], "delivery_type": "*", "name": "upgrade-protocol", "expectation": "origin", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "http", "subresource": "*"}, {"delivery_value": "strict-origin-when-cross-origin", "origin": ["same-http", "cross-http"], "delivery_type": "*", "name": "downgrade-protocol", "expectation": "omitted", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": "*"}, {"delivery_value": "strict-origin-when-cross-origin", "origin": "same-https", "delivery_type": "*", "name": "same-secure", "expectation": "stripped-referrer", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": "*"}, {"delivery_value": "strict-origin-when-cross-origin", "origin": "same-https", "delivery_type": "*", "name": "same-secure", "expectation": "origin", "expansion": "override", "redirection": "swap-origin", "source_context_list": "*", "source_scheme": "https", "subresource": "*"}, {"delivery_value": "strict-origin-when-cross-origin", "origin": "cross-https", "delivery_type": "*", "name": "cross-secure", "expectation": "origin", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "https", "subresource": "*"}], "description": "Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.", "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin", "name": "strict-origin-when-cross-origin", "title": "Referrer Policy is set to 'strict-origin-when-cross-origin'"}, {"test_expansion": [{"delivery_value": "unsafe-url", "origin": "*", "delivery_type": "*", "name": "generic", "expectation": "stripped-referrer", "expansion": "default", "redirection": "*", "source_context_list": "*", "source_scheme": "*", "subresource": "*"}], "description": "Check that all sub-resources get the stripped referrer URL.", "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url", "name": "unsafe-url", "title": "Referrer Policy is set to 'unsafe-url'"}], "test_expansion_schema": {"delivery_value": [null, "no-referrer", "no-referrer-when-downgrade", "same-origin", "origin", "origin-when-cross-origin", "strict-origin", "strict-origin-when-cross-origin", "unsafe-url"], "origin": ["same-http", "same-https", "cross-http", "cross-https"], "delivery_type": ["attr", "rel-noref", "http-rp", "meta"], "subresource": ["iframe-tag", "img-tag", "script-tag", "a-tag", "area-tag", "xhr", "worker-classic", "worker-module", "sharedworker-classic", "fetch"], "expectation": ["omitted", "origin", "stripped-referrer"], "expansion": ["default", "override"], "redirection": ["no-redirect", "keep-origin", "swap-origin"], "source_context_list": ["top", "req", "srcdoc-inherit", "srcdoc", "iframe", "worker-classic", "worker-classic-data", "worker-module", "worker-module-data"], "source_scheme": ["http", "https"]}, "source_context_list_schema": {"srcdoc-inherit": {"subresourcePolicyDeliveries": [], "description": "srcdoc iframe should inherit parent Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}, {"sourceContextType": "srcdoc"}]}, "worker-module": {"subresourcePolicyDeliveries": [], "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "worker-module", "policyDeliveries": ["policy"]}]}, "worker-module-data": {"subresourcePolicyDeliveries": [], "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "worker-module-data", "policyDeliveries": ["policy"]}]}, "worker-classic-data": {"subresourcePolicyDeliveries": [], "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "worker-classic-data", "policyDeliveries": ["policy"]}]}, "top": {"subresourcePolicyDeliveries": [], "description": "Policy set by the top-level Document", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["policy"]}]}, "req": {"subresourcePolicyDeliveries": ["nonNullPolicy"], "description": "Subresource request's policy should override Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}]}, "worker-classic": {"subresourcePolicyDeliveries": [], "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "worker-classic", "policyDeliveries": ["policy"]}]}, "iframe": {"subresourcePolicyDeliveries": [], "description": "external iframe's policy should override parent Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "iframe", "policyDeliveries": ["policy"]}]}, "srcdoc": {"subresourcePolicyDeliveries": [], "description": "srcdoc iframe's policy should override parent Document's policy", "sourceContextList": [{"sourceContextType": "top", "policyDeliveries": ["anotherPolicy"]}, {"sourceContextType": "srcdoc", "policyDeliveries": ["nonNullPolicy"]}]}}, "delivery_key": "referrerPolicy", "source_context_schema": {"supported_delivery_type": {"iframe": ["meta", "http-rp"], "worker-module-data": [], "worker-classic-data": [], "top": ["meta", "http-rp"], "worker-classic": ["http-rp"], "worker-module": ["http-rp"], "srcdoc": ["meta"]}, "supported_subresource": {"iframe": "*", "worker-module-data": ["xhr", "fetch"], "worker-classic-data": ["xhr", "fetch"], "top": "*", "worker-classic": ["xhr", "fetch", "worker-classic", "worker-module"], "worker-module": ["xhr", "fetch", "worker-classic", "worker-module"], "srcdoc": "*"}}};
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
deleted file mode 100644
index a65eaa7901b..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 7d5e9f51eef..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index bac63c5fb0e..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 60d5073c3fc..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 6be18f7699d..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 952e77c9cc6..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 48f71be2eb1..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index a28deb3c0dc..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 2ebcc268d93..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 6425c693b33..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index fcae5517b70..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 92437dea18b..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 9d2f1dc7bb0..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 77a7c7198da..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 490c294ced5..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index bb47761b3b5..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 4dc7edb6f57..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 11d7fe3e261..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 12e2c923aa9..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 269c233f650..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 3dc041adb2b..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 7985b8b5397..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 6f2526ec2ce..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 408a84a46e9..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 73a6d401686..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index db3836944c0..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 3e93e19a718..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index f556a17b5f4..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 966ccd4a906..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index b0f1c512bb3..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 3c24da11403..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 5147d1ae55f..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 5f043f56d9c..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 7235b46f693..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 898791470cd..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 915a0e04cb1..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 2b5c254b315..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 448fc03146a..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index b71a1ba2fea..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index c23f33e377c..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 0f8a6123318..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 25e7bed4966..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 0366ca590a2..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index e43090fc94d..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 94737a8ad11..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 7f20701fc23..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 1e0251a14db..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index a04b093f052..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 4c888a8955a..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index ea5c378b938..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index f95d9dcf862..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 805c1fce6ec..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 3be3cef8fe6..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 001876c67ea..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index d065511201c..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 8372e89bb96..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 0cb91426123..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 880ac954014..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index d1e21f26bee..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 81ea510e482..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 66353279841..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index d9bc87d7ed1..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index f4c0db2b33b..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index e0a4c18164a..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index ddf12c7dfbc..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 967c856ca94..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index d74467b0af6..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin-when-cross-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 1d53a856484..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 11002b84ccd..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 0660a7152c1..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 6dcd7f6fb5c..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 0776180d9a2..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 38e9578454e..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index ab822dec774..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index c51ebf6c472..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 14ee299d92a..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index ead14cf5f9d..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 1ee7fd41367..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 0110bf0e34f..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 05ade9a9562..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index ad0fa26cee5..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 074dc1c008c..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 02a8550756e..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index c67cc2478a0..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index e53c8315664..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 5c8ef0ef3e3..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index bb9bf2c1ee5..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index a4798d7b47d..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 0b58c64c200..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 3ab27355d09..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 6c8d7ecd7b8..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index efcd74ac789..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index eb84455bc12..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index dc71fc362ed..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 8752f5d2cc8..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 4c3a3e733dd..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 33640559429..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index dbffdfd9b70..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index ac598a4aef9..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index fe796af905d..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index df0b66b578a..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 3e6a5ef1e50..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index fc8d3c41bbb..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 3291f436ea9..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 19ad046a8a6..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index c8fe4c6ec6f..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index ec2f7efe8ac..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 207a092d679..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 6ca54f81610..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 6d3dc7018c6..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 685cb213ab0..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 65b84cbd52e..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 931a865b0a0..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 44da9c8838e..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 3e272c6f36d..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index bfb222a4475..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index e989b00ce58..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index a1f1e0e6f1b..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index ec4786e1e4d..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index baee333cbb8..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 2041b46c26c..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
-    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="strict-origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 0db6b0fbc2e..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 95eb256986e..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 59de544a1c0..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 42dffc718dd..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index a1c0ad2ecbd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 4214ed39789..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index c74fdf48aa7..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index d6c256cdd00..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 84f50a7242b..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index a4c9484c8c0..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 5ff57615500..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 214d0a41e68..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 21f6bd1faaa..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index a7054707dc4..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 62dbdaff92b..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index b537c0352c1..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 0881853070c..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 390e5a114d0..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 21ec099f4cf..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 9c05e66587a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 2bba3d1b958..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 4e46c27514d..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 43b78c36946..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 745f65c0488..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index e503b77b05c..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 9067040bb86..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 7b2f46326a3..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index e471c1fb030..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index dda3d2fb493..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 5e3c7911cd7..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index d68b3f0d60b..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 0d32296e8fd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index e0fe2ed9eca..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 5a66aa2ca70..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 228473d37a4..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 556a260ea63..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index e9f49f4ed9a..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index e225adb44b6..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index a2a97e73d1e..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index eae326f66c1..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 870b555c7b4..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 92186b38318..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 924ebe5e76c..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 8e374ad73ae..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 698ba1f52dc..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index c3eead4ac0c..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index b1c1f720a14..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index f0082510aaf..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index dbb8da1e03c..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 09aeb8fc143..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index e2f73ada79c..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 637f7d80196..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 649574394f1..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 1bb79c1f38a..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index a9053cc0649..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index c7536fc5080..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index b27ed1830b6..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 39a7b701c33..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 27f637f8447..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 3c11a22da1c..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index b02da368869..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 5f542a4c16c..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index a5a9a71c2d1..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index be363d79516..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 04e317062aa..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 3504c73637c..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers 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.headers
deleted file mode 100644
index 07af8e286fd..00000000000
--- 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.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: strict-origin
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 2177b2407fb..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 54b2947dc66..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 94f10a8e9de..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 9463f5394ad..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 3838698b0a8..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 5a1df9c256b..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 71a0b692afb..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 48861eb9bb7..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index c63d9a1608c..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index e2143e1a320..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index b8d84f7726c..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 4f36a9cb357..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 8edd239db2f..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 873b26a46eb..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index f0d5c81eca2..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index c985a404544..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 9881576a69b..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 203c5e73cbe..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 20a3252bf2f..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index d48173ffecc..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index c5a1548b12d..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 0ee367c9316..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 3e6c3a175f1..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 533a22a7241..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 32aab014434..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index a92d87e2782..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 6f9417785ff..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index ad8d9e7f190..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index a218fb4980d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index f3fed6c88b8..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index a991f0c6757..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 1546f57a7df..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 3877c0cbaa2..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 8542943aabe..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index f688eda4732..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index aefc8786e2c..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 107e1ca1a67..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 2b4472d3554..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 5889d9e90f2..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 2edd19df54f..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 418e84a8210..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index d46cf842c63..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 538500ad734..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 58da77e1a29..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 85dab619c2b..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 92c2b51d15e..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index b9818652513..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 20f21df5657..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 7cb4aaf0943..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index e7caa273156..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index b0fc558d76e..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index bac4c36dfe5..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 0d76c92864d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 2b24a45ec52..00000000000
--- 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
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="strict-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "strict-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index a82cc859c33..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 8f57b3335ac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 3991c324090..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index f61537ab2b7..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 5dfb2f8a164..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 50010aaeafa..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index d17712e1d17..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index e514cb738d3..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 679128d15f3..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 8afd60eabca..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index f63430fde91..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 6f78f7ab581..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 10fca8ad729..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index f60d3ed06cc..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 44b1b21a711..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index e9349686169..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 894676e8544..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 42b84b21508..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 9383af1ee71..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 03c22def281..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index f14ea6703b3..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index de791441ea7..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 83707cdee07..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 2b92b33df18..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 142267bd452..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 738f5c34ade..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index a3be0469c9f..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 29ac25d14a1..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 3a95f9f42b8..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 177abec135b..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 5ba49e0acdd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 4bff34e02c9..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index fa58ac157f2..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 4cf2262dab7..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index aedf67b946b..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 4181c8a875f..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index dc6f090b51b..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 22d449d42f4..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 1492be672bf..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index c35639823ec..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index bc5f3bc3e94..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index c458763f10e..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 00e1d936324..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index c17379cfad0..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index faca9b10f87..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index b0c9e254228..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index ec8d76fc0c9..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 3334b1aba36..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index cf19b751ec8..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 4c44cbce0d9..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 61889e61f95..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 35f3e69127d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 9cc15eb4b90..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index dc5ffbd5de6..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 2ac2803d0ed..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 5b22bbc5dce..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 125d2fb6c3d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index bf9143c2874..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index bdb66972d4a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 8aaeb884177..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index ff3cd97f497..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 3f38a8a242d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index b1d13cdf89d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index 6e02ec75c7d..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index dbba2048bac..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index f945a1d0c83..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. -->
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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.headers b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
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
deleted file mode 100644
index ba120250e94..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 46522686598..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 0c7c8484a4e..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index d6b47ccbd36..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 96e137e4112..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 06ba58084f3..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index d54694fb1ed..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 6e1a080f9cb..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 6343373d16a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 5659e1f17fd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index bf32a5b6b59..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 59919b70ecd..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 4a337036964..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index d767da3fd7b..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index a119bd26f51..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 9045c6f9877..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 79164f38d4f..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index dabf50d51c6..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 6df7de3ecdb..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 88c6a0f7aba..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index df434df7ab1..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 2a264a4b107..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index a6775759e6a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 91e3cd52054..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index cbf5e1c28ff..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index f2035473523..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index f1837a8f7bb..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 3882bfd35d9..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 698f9f64c05..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 5e6177d1728..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 621ac5bb3e5..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 8711a507ab5..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 81294f80501..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index d0b1553b75a..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 1d5ef969999..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 2e732e6567c..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 2529091d31c..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index ab2c0a35831..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 56668b94ca1..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index f2593530884..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index b5c7283668c..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index d4af8f3c3bb..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index f501512aaf3..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index d76e3c62c56..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 7f50fdbe077..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 529b4b30658..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 340e5d55d5c..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 709d209649b..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 3b744a333ca..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 00c704c6e38..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index e35b0a640e3..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 19f9faed619..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 42b8a17f079..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 50ab0a6eaeb..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 14a6eeb2bc6..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 92c65585c59..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index ede753c5361..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index b1f6e1dc1dd..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index b69090ff2b9..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index a5bda07fa17..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index c61e9dfe6f1..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index d7a06eae0dd..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index bd9d445ddc7..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 4bcfe741384..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 2f55f3f4bf3..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index fcdb3014ef7..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index f6fc0deec71..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 90db32e3818..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 22605533552..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 83d37336587..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 269dd5ab815..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 5367d9e882e..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 999d68c277f..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 6e57d20ba55..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index b5e3d6c80a3..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 35dc6568c3a..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index cc38b182da7..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index dc3f4cf1e5e..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index e5c1855fde4..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 4724f670f98..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 74f9f0e8a74..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 15a6abbf5ca..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index d8f487a90ef..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 14d4f5fb06b..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 3e02f034fec..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 3f20abbb40e..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index e594604429f..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 3e0dcd40d3d..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index ef5a7e6c88b..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index a50da9cb0cc..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 4a01a41549b..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 0a66eea4641..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 5984794f2a0..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 0c02a2ead89..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index c656d41de40..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 874e3cb3bed..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 9d54a271872..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 43015a873cf..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index ed58d7bd11b..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index c5114ecd89c..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 34f650da7f4..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 1e668ae6d8b..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 19d80342987..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 705411d518c..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 99c1bc56a43..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 607b4c29e80..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 1bc364522cd..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index ca8adad1243..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index b04ed3354dd..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index a06130ce4a4..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index fbdaf4b0557..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 4fd95a894c4..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 1f65303cd10..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 4b70a9afd13..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index f3c586e12e2..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 9bcb05db1fe..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 7b48d72c92e..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 5b539644181..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 841b54b5843..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index ae3939410a8..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 4e7d7c9b988..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index f48a201bbb0..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 111fa37e95e..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index d1cc1faef43..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index bcd5661d9c0..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index a637f732ea0..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 18e29ee1fc6..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 14ce35bd1eb..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index e9b5f75f9cc..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 392c5783558..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 58977c3e7b4..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 59cc2bda485..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 67625838e8d..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 45d7f1e9169..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 7d495b43c57..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index afd29bcd69b..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index e12c41d3b65..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index e4499893714..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 7544a66b826..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 6c1bf133745..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index e6424cdf933..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 284af1c6860..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 8c7f2bd5d37..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 5ba5152bc2b..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index fcf8844e900..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 26b14d73149..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index c632fa8e783..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 4590df6a015..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index cbe8df3c410..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 69e5b6b483c..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 177bdd6c772..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index abe6ef4500c..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 15fb33654e5..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 0d52c78f4a9..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via img-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "img-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index ef9db2cbca1..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 02678004f51..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index c391b257a81..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 03c4677086d..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 60a0f6ebcb3..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index d1745b41235..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 33df9910306..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index d11c4a1897b..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 2bf06bb2110..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 2bcca81084c..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index e4b835d8644..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 20590be9e24..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 8bf8bd05ff1..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 8d330b11bca..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index fe3e977d000..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 4db7894a80f..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 8bb522349b0..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index db792b5164a..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 8cdf6d70efa..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 9a41ab1b006..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 581efdb75d7..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index f2c77dcd96c..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 8db2725b16b..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 11baca87b24..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index e349d5686ff..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 500d47a1c95..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 21549ca927e..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index ca7d40ed2f6..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index fdc8bbef59d..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index e6518c9e479..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 220b5aa320d..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index f0b4658aec6..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 4cfd819a473..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 4ea3fe52684..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 0978fb710d6..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 7a4fe02b9b7..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 21065a0f8b5..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 21b9d284bfa..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via module-worker using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "module-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 6911528c08d..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index cf7d1dd9c27..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 21882b16a44..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 0028373a419..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 17eff823084..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via shared-worker using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "shared-worker",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index dfff2a541dc..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 3c7cea5bca0..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via worker-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "worker-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 96971a833e3..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index c98fa10e571..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 4fe678652d0..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index c2e04ad3614..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 1aaa67c96d1..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 7af45bc8865..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via fetch-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "fetch-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 054b2eb241a..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index faf51f1e759..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index a9141695795..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 53cdc7edf00..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 406ef5dff60..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 993c9ea86b1..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via script-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "script-tag",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index d88b4994e32..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index e5a4240f5a4..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
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
deleted file mode 100644
index 834e2ef0101..00000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via xhr-request using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "xhr-request",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js b/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js
index b52ee3bf325..73dda0920f1 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js
@@ -45,6 +45,15 @@ function getMatrixFromTransform(transform) {
           m14, m24, m34, 1];
 }
 
+function getGFXTransformFromPosition(x, y, z) {
+  let transform = new gfx.mojom.Transform();
+  transform.matrix = getMatrixFromTransform({
+    position: [x, y, z],
+    orientation: [0, 0, 0, 1]
+  });
+  return transform;
+}
+
 class ChromeXRTest {
   constructor() {
     this.mockVRService_ = new MockVRService(mojo.frameInterfaces);
@@ -369,7 +378,7 @@ class MockRuntime {
           leftDegrees: 50.899,
           rightDegrees: 35.197
         },
-        offset: { x: -0.032, y: 0, z: 0 },
+        headFromEye: getGFXTransformFromPosition(-0.032, 0, 0),
         renderWidth: 20,
         renderHeight: 20
       },
@@ -380,7 +389,7 @@ class MockRuntime {
           leftDegrees: 50.899,
           rightDegrees: 35.197
         },
-        offset: { x: 0.032, y: 0, z: 0 },
+        headFromEye: getGFXTransformFromPosition(0.032, 0, 0),
         renderWidth: 20,
         renderHeight: 20
       },
@@ -415,7 +424,7 @@ class MockRuntime {
         leftDegrees: toDegrees(leftTan),
         rightDegrees: toDegrees(rightTan)
       },
-      offset: { x: offset[0], y: offset[1], z: offset[2] },
+      headFromEye: getGFXTransformFromPosition(offset[0], offset[1], offset[2]),
       renderWidth: fakeXRViewInit.resolution.width,
       renderHeight: fakeXRViewInit.resolution.height
     };
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/activation.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/activation.https.html
index 5755758e571..007ecaad76c 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/activation.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/activation.https.html
@@ -113,10 +113,12 @@ promise_test(t => {
     var scope = 'resources/skip-waiting';
     var worker_url = 'resources/mint-new-worker.py?skip-waiting';
     var registration;
+    var iframe;
     var new_worker;
     return setup_activation_test(t, scope, worker_url)
       .then(result => {
           registration = result.registration;
+          iframe = result.iframe;
           // Finish the request. The iframe does not need to be removed because
           // skipWaiting() was called.
           new_worker = registration.waiting;
@@ -126,6 +128,8 @@ promise_test(t => {
         })
       .then(() => {
           assert_equals(registration.active, new_worker);
+          // Remove the iframe.
+          iframe.remove();
         });
   }, 'skipWaiting bypasses no controllee requirement');
 
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/detached-context.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/detached-context.https.html
index 5ae4de8cc81..f96370d2010 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/detached-context.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/detached-context.https.html
@@ -59,6 +59,7 @@ promise_test(t => {
       .then(() => {
           assert_equals(resolvedCount, 0,
                         'methods called on a detached registration should not resolve');
+          frame.remove();
         })
   }, 'accessing a ServiceWorkerRegistration from a removed iframe');
 
@@ -102,6 +103,7 @@ promise_test(t => {
         assert_equals(
             get_navigator().serviceWorker,
             iframe.contentWindow.navigator.serviceWorker);
+        iframe.remove();
       });
   }, 'accessing navigator.serviceWorker on a detached iframe');
 
diff --git a/tests/wpt/web-platform-tests/sms/interceptor.https.html b/tests/wpt/web-platform-tests/sms/interceptor.https.html
index 86b21922284..39b749b6d32 100644
--- a/tests/wpt/web-platform-tests/sms/interceptor.https.html
+++ b/tests/wpt/web-platform-tests/sms/interceptor.https.html
@@ -12,7 +12,7 @@
 
  1) Include <script src="./sms_provider.js"></script> in your test.
  2) Set expectations
-  await expect(receive).andReturn((timeout) => {
+  await expect(receive).andReturn(() => {
     // mock behavior
   })
  3) Call navigator.sms.receive()
@@ -34,7 +34,7 @@
 'use strict';
 
 promise_test(async t => {
-  await expect(receive).andReturn((timeout) => {
+  await expect(receive).andReturn(() => {
       return Promise.resolve({
         status: Status.kSuccess,
         message: "hello",
@@ -47,13 +47,13 @@ promise_test(async t => {
 }, 'Basic usage');
 
 promise_test(async t => {
-  await expect(receive).andReturn((timeout) => {
+  await expect(receive).andReturn(() => {
       return Promise.resolve({
         status: Status.kSuccess,
         message: "hello1",
       });
   });
-  await expect(receive).andReturn((timeout) => {
+  await expect(receive).andReturn(() => {
       return Promise.resolve({
         status: Status.kSuccess,
         message: "hello2",
@@ -71,103 +71,35 @@ promise_test(async t => {
 }, 'Handle multiple requests in different order.');
 
 promise_test(async t => {
-  await expect(receive).andReturn((timeout) => {
+  await expect(receive).andReturn(() => {
       return Promise.resolve({
-        status: Status.kTimeout,
+        status: Status.kCancelled,
       });
   });
-  await expect(receive).andReturn((timeout) => {
+  await expect(receive).andReturn(() => {
       return Promise.resolve({
         status: Status.kSuccess,
         message: "success",
       });
   });
 
-  let timeout_sms = navigator.sms.receive();
+  let cancelled_sms = navigator.sms.receive();
   let successful_sms = navigator.sms.receive();
 
   let successful_msg = await successful_sms;
   assert_equals(successful_msg.content, "success");
 
   try {
-    await timeout_sms;
-    assert_unreached('Expected TimeoutError to be thrown.');
+    await cancelled_sms;
+    assert_unreached('Expected AbortError to be thrown.');
   } catch (error) {
-    assert_equals(error.name, "TimeoutError");
-    assert_equals(error.message, "SMSReceiver timed out.");
+    assert_equals(error.name, "AbortError");
+    assert_equals(error.message, "SMSReceiver was aborted.");
   }
 }, 'Handle multiple requests with success and error.');
 
 promise_test(async t => {
-  await expect(receive).andReturn((timeout) => {
-      return Promise.resolve({
-        status: Status.kTimeout,
-      });
-  });
-
-  try {
-    await navigator.sms.receive();
-    assert_unreached('Expected TimeoutError to be thrown.');
-  } catch (error) {
-    assert_equals(error.name, "TimeoutError");
-    assert_equals(error.message, "SMSReceiver timed out.");
-  }
-}, 'Deal with timeouts');
-
-promise_test(async t => {
-  try {
-    await navigator.sms.receive({timeout: 0});
-    assert_unreached('Expected NotSupportedError to be thrown.');
-  } catch (error) {
-    assert_equals(error.name, "NotSupportedError");
-    assert_equals(error.message, "Invalid timeout.");
-  }
-}, 'Should throw error with invalid timeout (0)');
-
-promise_test(async t => {
-  try {
-    await navigator.sms.receive({timeout: null});
-    assert_unreached('Expected NotSupportedError to be thrown.');
-  } catch (error) {
-    assert_equals(error.name, "NotSupportedError");
-    assert_equals(error.message, "Invalid timeout.");
-  }
-}, 'Should throw error with invalid timeout (null)');
-
-promise_test(async t => {
-  try {
-    await navigator.sms.receive({timeout: -1});
-    assert_unreached('Expected NotSupportedError to be thrown.');
-  } catch (error) {
-    assert_equals(error.name, "NotSupportedError");
-    assert_equals(error.message, "Invalid timeout.");
-  }
-}, 'Should throw error with invalid timeout (-1)');
-
-promise_test(async t => {
-  try {
-    await navigator.sms.receive({timeout: NaN});
-    assert_unreached('Expected NotSupportedError to be thrown.');
-  } catch (error) {
-    assert_equals(error.name, "NotSupportedError");
-    assert_equals(error.message, "Invalid timeout.");
-  }
-}, 'Should throw error with invalid timeout (NaN)');
-
-promise_test(async t => {
-  await expect(receive).andReturn((timeout) => {
-      return Promise.resolve({
-        status: Status.kSuccess,
-        message: "hello",
-      });
-  });
-
-  let sms = await navigator.sms.receive({timeout: undefined});
-  assert_equals(sms.content, "hello");
-}, 'Should use default value for timeout (undefined)');
-
-promise_test(async t => {
-  await expect(receive).andReturn((timeout) => {
+  await expect(receive).andReturn(() => {
       return Promise.resolve({
         status: Status.kCancelled,
       });
diff --git a/tests/wpt/web-platform-tests/sms/sms_provider.js b/tests/wpt/web-platform-tests/sms/sms_provider.js
index 4506135551c..11fd8466e98 100644
--- a/tests/wpt/web-platform-tests/sms/sms_provider.js
+++ b/tests/wpt/web-platform-tests/sms/sms_provider.js
@@ -36,16 +36,16 @@ class FakeSmsReceiverImpl {
     return this;
   }
 
-  receive(timeout) {
+  receive() {
     let call = this.returnValues.receive.shift();
     if (!call) {
       throw new Error("Unexpected call.");
     }
-    return call(timeout);
+    return call();
   }
 }
 
-function receive(timeout, callback) {
+function receive(callback) {
   throw new Error("expected to be overriden by tests");
 }
 
diff --git a/tests/wpt/web-platform-tests/sms/sms_receiver.idl b/tests/wpt/web-platform-tests/sms/sms_receiver.idl
index b71b6a3e0db..64048523f90 100644
--- a/tests/wpt/web-platform-tests/sms/sms_receiver.idl
+++ b/tests/wpt/web-platform-tests/sms/sms_receiver.idl
@@ -13,7 +13,7 @@ interface SMS {
 };
 
 dictionary SMSReceiverOptions {
-  unsigned long timeout;
+  // TODO(b/976401): Implement abort controller.
 };
 
 [
diff --git a/tests/wpt/web-platform-tests/svg/animations/beginelement-instance-time-1.html b/tests/wpt/web-platform-tests/svg/animations/beginelement-instance-time-1.html
new file mode 100644
index 00000000000..aa1cb8c983d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/animations/beginelement-instance-time-1.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<title>beginElement() timing</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<svg width="100" height="20" style="border: grey 1px solid">
+  <rect width="1" height="20">
+    <animateMotion path="M0,0h100" dur="100ms"/>
+  </rect>
+</svg>
+<script>
+  async_test(t => {
+    const svg = document.querySelector('svg');
+    const motion = document.querySelector('animateMotion');
+    motion.addEventListener('endEvent', t.step_func(() => {
+      t.step_timeout(t.step_func(() => {
+        motion.beginElement();
+        let start = svg.getCurrentTime();
+        requestAnimationFrame(t.step_func_done(() => {
+          svg.pauseAnimations();
+          let elapsed = svg.getCurrentTime() - start;
+          let expected_pos = Math.min(elapsed * 1000, 100);
+          let actual_pos = motion.parentElement.getCTM().e;
+          assert_approx_equals(actual_pos, expected_pos, 2, `position after ${elapsed}`);
+        }));
+      }), 50);
+    }), { once: true });
+  });
+</script>
diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/masked-ref.html b/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/masked-ref.html
new file mode 100644
index 00000000000..1a3b13c9451
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/masked-ref.html
@@ -0,0 +1,2 @@
+<!doctype HTML>
+<div style="width: 32px; height: 32px; background: green; overflow: hidden; border-radius: 50%"></div>
diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/masked.html b/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/masked.html
new file mode 100644
index 00000000000..ad18e8931aa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/masked.html
@@ -0,0 +1,13 @@
+<!doctype HTML>
+<title>Tests that an SVG mask applies to a foreignObject element</title>
+<link rel="match" href="masked-ref.html">
+<link rel="author" title="Chris Harrelson" href="mailto:chrishtr@chromium.org">
+<link rel="help" href="https://svgwg.org/svg2-draft/single-page.html#embedded-ForeignObjectElement"/>
+<svg style="display: block">
+    <foreignObject x="0" y="0" width="32" height="32" mask="url(#circle)">
+        <div style="width: 32px; height: 32px; background: green"></div>
+    </foreignObject>
+    <mask id="circle" maskContentUnits="objectBoundingBox" viewBox="0 0 1 1">
+        <circle fill="white" cx="0.5" cy="0.5" r="0.5"></circle>
+    </mask>
+</svg>
diff --git a/tests/wpt/web-platform-tests/svg/struct/scripted/autofocus-attribute.svg b/tests/wpt/web-platform-tests/svg/struct/scripted/autofocus-attribute.svg
index 6c095a4bef5..d8f25741ee4 100644
--- a/tests/wpt/web-platform-tests/svg/struct/scripted/autofocus-attribute.svg
+++ b/tests/wpt/web-platform-tests/svg/struct/scripted/autofocus-attribute.svg
@@ -19,7 +19,7 @@ promise_test(async t => {
   svgA.setAttribute('href', '#');
   svgA.setAttribute('autofocus', 'autofocus');
   w.document.documentElement.appendChild(svgA);
-  await waitUntilStableAutofocusState(t);
+  await waitUntilStableAutofocusState(w);
   assert_equals(w.document.activeElement, svgA);
 }, '<a> should support autofocus');
 
@@ -32,7 +32,7 @@ promise_test(async t => {
   path.setAttribute('tabindex', '0');
   path.setAttribute('autofocus', 'autofocus');
   w.document.documentElement.appendChild(path);
-  await waitUntilStableAutofocusState(t);
+  await waitUntilStableAutofocusState(w);
   assert_equals(w.document.activeElement, path);
 }, 'Renderable element with tabindex should support autofocus');
 
@@ -44,7 +44,7 @@ promise_test(async t => {
   element.setAttribute('tabindex', '0');
   element.setAttribute('autofocus', 'autofocus');
   w.document.documentElement.appendChild(element);
-  await waitUntilStableAutofocusState(t);
+  await waitUntilStableAutofocusState(w);
   // https://html.spec.whatwg.org/C/#dom-documentorshadowroot-activeelement
   // 6. If candidate's document element is non-null, then return that document
   //    element.
diff --git a/tests/wpt/web-platform-tests/tools/wpt/tests/test_wpt.py b/tests/wpt/web-platform-tests/tools/wpt/tests/test_wpt.py
index 04c0723aacb..a2498333c2b 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/tests/test_wpt.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/tests/test_wpt.py
@@ -359,15 +359,15 @@ def test_tests_affected_null(capsys, manifest_dir):
     # the current working directory for references to the changed files, not the ones at
     # that specific commit. But we can at least test it returns something sensible.
     # The test will fail if the file we assert is renamed, so we choose a stable one.
-    commit = "9bf1daa3d8b4425f2354c3ca92c4cf0398d329dd"
+    commit = "2614e3316f1d3d1a744ed3af088d19516552a5de"
     with pytest.raises(SystemExit) as excinfo:
         wpt.main(argv=["tests-affected", "--null", "--metadata", manifest_dir, "%s~..%s" % (commit, commit)])
     assert excinfo.value.code == 0
     out, err = capsys.readouterr()
 
     tests = out.split("\0")
-    assert "dom/interfaces.html" in tests
-    assert "html/dom/interfaces.https.html" in tests
+    assert "dom/idlharness.any.js" in tests
+    assert "xhr/idlharness.any.js" in tests
 
 
 @pytest.mark.slow
diff --git a/tests/wpt/web-platform-tests/trusted-types/block-eval.tentative.html b/tests/wpt/web-platform-tests/trusted-types/block-eval.tentative.html
index e1a6a69accd..cd4f5827c53 100644
--- a/tests/wpt/web-platform-tests/trusted-types/block-eval.tentative.html
+++ b/tests/wpt/web-platform-tests/trusted-types/block-eval.tentative.html
@@ -12,19 +12,19 @@
 <script nonce="abc">
   let p = createScript_policy(window, 1);
   test(t => {
+    let a = 0;
     assert_throws(new EvalError(), _ => {
-      eval('"hello there"') });
-  }, "eval with plain string throws.");
+      eval('a="hello there"')
+    });
+    assert_equals(a, 0);
+  }, "eval with plain string throws (both block).");
 
   test(t => {
-    let s = eval(p.createScript('"Hello transformed string"'));
-    assert_equals(s, "Hello a cat string");
-  }, "eval with TrustedScript works.");
-
-  TrustedTypes.createPolicy("default", { createScript: createScriptJS }, true);
-  test(t => {
-    let s = eval('"Hello transformed untrusted string"');
-    assert_equals(s, "Hello a cat untrusted string");
-  }, "eval obeys default policy.");
+    let a = 0;
+    assert_throws(new EvalError(), _ => {
+      eval(p.createScript('a="Hello transformed string"'));
+    });
+    assert_equals(a, 0);
+  }, "eval with TrustedScript throws (script-src blocks).");
 </script>
 
diff --git a/tests/wpt/web-platform-tests/trusted-types/eval-with-permissive-csp.tentative.html b/tests/wpt/web-platform-tests/trusted-types/eval-with-permissive-csp.tentative.html
index 68d119a5201..25b4948c039 100644
--- a/tests/wpt/web-platform-tests/trusted-types/eval-with-permissive-csp.tentative.html
+++ b/tests/wpt/web-platform-tests/trusted-types/eval-with-permissive-csp.tentative.html
@@ -13,9 +13,12 @@
 <script nonce="abc">
   let p = createScript_policy(window, 1);
   test(t => {
-    let s = eval('"hello there"');
-    assert_equals(s, "hello there");
-  }, "eval with plain string with Trusted Types and permissive CSP works.");
+    let a = 0;
+    assert_throws(new EvalError(), _ => {
+      eval('a="hello there"');
+    });
+    assert_equals(a, 0);
+  }, "eval with plain string with Trusted Types and permissive CSP throws (no type).");
 
   test(t => {
     let s = eval(p.createScript('"Hello transformed string"'));
diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.https.html b/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.https.html
new file mode 100644
index 00000000000..f60bb9fe514
--- /dev/null
+++ b/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.https.html
@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<head>
+  <script nonce="123" src="/resources/testharness.js"></script>
+  <script nonce="123"src="/resources/testharnessreport.js"></script>
+  <script nonce="123"src="/content-security-policy/support/testharness-helper.js"></script>
+</head>
+<body>
+  <script nonce="123">
+  // CSP insists the "trusted-types: ..." directives are deliverd as headers
+  // (rather than as "<meta http-equiv" tags). This test assumes the following
+  // headers are set in the .headers file:
+  //
+  //   Content-Security-Policy: trusted-types *
+  //   Content-Security-Policy: script-src 'unsafe-inline'; report-uri ...
+  //   Content-Security-Policy: plugin-types bla/blubb
+  //
+  // The last rule is there so we can provoke a CSP violation report at will.
+  // The intent is that in order to test that a violation has *not* been thrown
+  // (and without resorting to abominations like timeouts), we force a *another*
+  // CSP violation (by violating the img-src rule) and when that event is
+  // processed we can we sure that an earlier event - if it indeed occurred -
+  // must have already been processed.
+
+  // Return function that returns a promise that resolves on the given
+  // violation report.
+  // how_many - how many violation events are expected.
+  // filter_arg - iff function, call it with the event object.
+  //              Else, string-ify and compare against event.originalPolicy.
+  function promise_violation(filter_arg) {
+    return _ => new Promise((resolve, reject) => {
+      function handler(e) {
+        let matches = (filter_arg instanceof Function)
+            ? filter_arg(e)
+            : (e.originalPolicy.includes(filter_arg));
+        if (matches) {
+          document.removeEventListener("securitypolicyviolation", handler);
+          e.stopPropagation();
+          resolve(e);
+        }
+      }
+      document.addEventListener("securitypolicyviolation", handler);
+    });
+  }
+
+  // Like assert_throws, but we don't care about the exact error. We just want
+  // to run the code and continue.
+  function expect_throws(fn) {
+    try { fn(); assert_unreached(); } catch (err) { /* ignore */ }
+  }
+
+  // A sample policy we use to test TrustedTypes.createPolicy behaviour.
+  const id = x => x;
+  const a_policy = {
+    createHTML: id,
+    createScriptURL: id,
+    createURL: id,
+    createScript: id,
+  };
+
+  const scriptyPolicy = TrustedTypes.createPolicy('allowEval', a_policy);
+
+  // Provoke/wait for a CSP violation, in order to be sure that all previous
+  // CSP violations have been delivered.
+  function promise_flush() {
+    return promise_violation("plugin-types bla/blubb");
+  }
+  function flush() {
+   expect_throws(_ => {
+      var o = document.createElement('object');
+      o.type = "application/x-shockwave-flash";
+      document.body.appendChild(o);
+    });
+  }
+
+  window.script_run_beacon = 'never_overwritten';
+
+  promise_test(t => {
+    let p = Promise.resolve()
+        .then(promise_violation("trusted-types *"))
+        .then(promise_flush());
+    expect_throws(_ => eval('script_run_beacon="should not run"'));
+    assert_equals(script_run_beacon, 'never_overwritten');
+    flush();
+    return p;
+  }, "Trusted Type violation report: evaluating a string violates both script-src and trusted-types.");
+
+  promise_test(t => {
+    let p = Promise.resolve()
+        .then(promise_violation("script-src"))
+        .then(promise_flush());
+    expect_throws(_ => eval('script_run_beacon="should not run"'));
+    // TODO(ssanfilippo) This should throw, but doesn't yet. See crbug.com/992424.
+    eval(scriptyPolicy.createScript('script_run_beacon="i ran"'));
+    flush();
+    assert_not_equals(script_run_beacon, 'i ran'); // Code did not run.
+    return p;
+  }, "Trusted Type violation report: evaluating a Trusted Script violates script-src.");
+
+  promise_test(t => {
+    TrustedTypes.createPolicy('default', {
+      createScript: s => s.replace('payload', 'default policy'),
+    }, true);
+    let p = Promise.resolve()
+        .then(promise_violation((e) =>
+           e.effectiveDirective.includes('script-src') &&
+           e.sample.includes("default policy")))
+        .then(promise_flush());
+    expect_throws(_ => eval('script_run_beacon="payload"')); // script-src will block.
+    assert_not_equals(script_run_beacon, 'default policy'); // Code did not run.
+    flush();
+    return p;
+  }, "Trusted Type violation report: script-src restrictions apply after the default policy runs.");
+
+  </script>
+</body>
diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.https.html.headers b/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.https.html.headers
new file mode 100644
index 00000000000..4bc0bd3c1ab
--- /dev/null
+++ b/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.https.html.headers
@@ -0,0 +1,4 @@
+Content-Security-Policy: trusted-types *
+Content-Security-Policy: script-src http: https: 'nonce-123' 'report-sample'
+Content-Security-Policy: plugin-types bla/blubb
+
diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-report-only.tentative.https.html b/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-report-only.tentative.https.html
new file mode 100644
index 00000000000..1fb65459468
--- /dev/null
+++ b/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-report-only.tentative.https.html
@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<head>
+  <script nonce="123" src="/resources/testharness.js"></script>
+  <script nonce="123"src="/resources/testharnessreport.js"></script>
+  <script nonce="123"src="/content-security-policy/support/testharness-helper.js"></script>
+</head>
+<body>
+  <script nonce="123">
+  // CSP insists the "trusted-types: ..." directives are deliverd as headers
+  // (rather than as "<meta http-equiv" tags). This test assumes the following
+  // headers are set in the .headers file:
+  //
+  //   Content-Security-Policy: trusted-types *
+  //   Content-Security-Policy: script-src 'unsafe-inline' 'unsafe-eval'; report-uri ...
+  //   Content-Security-Policy: plugin-types bla/blubb
+  //
+  // The last rule is there so we can provoke a CSP violation report at will.
+  // The intent is that in order to test that a violation has *not* been thrown
+  // (and without resorting to abominations like timeouts), we force a *another*
+  // CSP violation (by violating the img-src rule) and when that event is
+  // processed we can we sure that an earlier event - if it indeed occurred -
+  // must have already been processed.
+
+  // Return function that returns a promise that resolves on the given
+  // violation report.
+  //
+  // filter_arg - iff function, call it with the event object.
+  //              Else, string-ify and compare against event.originalPolicy.
+  function promise_violation(filter_arg) {
+    return _ => new Promise((resolve, reject) => {
+      function handler(e) {
+        let matches = (filter_arg instanceof Function)
+            ? filter_arg(e)
+            : (e.originalPolicy.includes(filter_arg));
+        if (matches) {
+          document.removeEventListener("securitypolicyviolation", handler);
+          e.stopPropagation();
+          resolve(e);
+        }
+      }
+      document.addEventListener("securitypolicyviolation", handler);
+    });
+  }
+
+  // Like assert_throws, but we don't care about the exact error. We just want
+  // to run the code and continue.
+  function expect_throws(fn) {
+    try { fn(); assert_unreached(); } catch (err) { /* ignore */ }
+  }
+
+  // A sample policy we use to test TrustedTypes.createPolicy behaviour.
+  const id = x => x;
+  const a_policy = {
+    createHTML: id,
+    createScriptURL: id,
+    createURL: id,
+    createScript: id,
+  };
+
+  const scriptyPolicy = TrustedTypes.createPolicy('allowEval', a_policy);
+
+  // Provoke/wait for a CSP violation, in order to be sure that all previous
+  // CSP violations have been delivered.
+  function promise_flush() {
+    return promise_violation("plugin-types bla/blubb");
+  }
+  function flush() {
+   expect_throws(_ => {
+      var o = document.createElement('object');
+      o.type = "application/x-shockwave-flash";
+      document.body.appendChild(o);
+    });
+  }
+
+  window.script_run_beacon = 'vanilla';
+
+  promise_test(t => {
+    let p = Promise.resolve()
+        .then(promise_violation("trusted-types *"))
+        .then(promise_flush());
+    eval('script_run_beacon="report-only-does-not-stop"');
+    assert_equals(script_run_beacon, 'report-only-does-not-stop');
+    flush();
+    return p;
+  }, "Trusted Type violation report: evaluating a string.");
+
+  promise_test(t => {
+    let p = promise_flush()();
+    eval(scriptyPolicy.createScript('script_run_beacon="trusted-script-ok"'));
+    flush();
+    assert_equals(script_run_beacon, 'trusted-script-ok');
+    return p;
+  }, "Trusted Type violation report: evaluating a Trusted Script.");
+
+  promise_test(t => {
+    TrustedTypes.createPolicy('default', {
+      createScript: s => s.replace('payload', 'default policy'),
+    }, true);
+    let p = promise_flush()();
+    eval('script_run_beacon="payload"');
+    assert_equals(script_run_beacon, 'default policy');
+    flush();
+    return p;
+  }, "Trusted Type violation report: default policy runs in report-only mode.");
+
+  </script>
+</body>
diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-report-only.tentative.https.html.headers b/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-report-only.tentative.https.html.headers
new file mode 100644
index 00000000000..ba26c77fbf4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-report-only.tentative.https.html.headers
@@ -0,0 +1,4 @@
+Content-Security-Policy-Report-Only: trusted-types *
+Content-Security-Policy: script-src http: https: 'nonce-123' 'unsafe-eval'
+Content-Security-Policy: plugin-types bla/blubb
+
diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting.tentative.https.html b/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting.tentative.https.html
new file mode 100644
index 00000000000..309873cb1f8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting.tentative.https.html
@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<head>
+  <script nonce="123" src="/resources/testharness.js"></script>
+  <script nonce="123"src="/resources/testharnessreport.js"></script>
+  <script nonce="123"src="/content-security-policy/support/testharness-helper.js"></script>
+</head>
+<body>
+  <script nonce="123">
+  // CSP insists the "trusted-types: ..." directives are deliverd as headers
+  // (rather than as "<meta http-equiv" tags). This test assumes the following
+  // headers are set in the .headers file:
+  //
+  //   Content-Security-Policy: trusted-types *
+  //   Content-Security-Policy: script-src 'unsafe-inline' 'unsafe-eval'; report-uri ...
+  //   Content-Security-Policy: plugin-types bla/blubb
+  //
+  // The last rule is there so we can provoke a CSP violation report at will.
+  // The intent is that in order to test that a violation has *not* been thrown
+  // (and without resorting to abominations like timeouts), we force a *another*
+  // CSP violation (by violating the img-src rule) and when that event is
+  // processed we can we sure that an earlier event - if it indeed occurred -
+  // must have already been processed.
+
+  // Return function that returns a promise that resolves on the given
+  // violation report.
+  //
+  // filter_arg - iff function, call it with the event object.
+  //              Else, string-ify and compare against event.originalPolicy.
+  function promise_violation(filter_arg) {
+    return _ => new Promise((resolve, reject) => {
+      function handler(e) {
+        let matches = (filter_arg instanceof Function)
+            ? filter_arg(e)
+            : (e.originalPolicy.includes(filter_arg));
+        if (matches) {
+          document.removeEventListener("securitypolicyviolation", handler);
+          e.stopPropagation();
+          resolve(e);
+        }
+      }
+      document.addEventListener("securitypolicyviolation", handler);
+    });
+  }
+
+  // Like assert_throws, but we don't care about the exact error. We just want
+  // to run the code and continue.
+  function expect_throws(fn) {
+    try { fn(); assert_unreached(); } catch (err) { /* ignore */ }
+  }
+
+  // A sample policy we use to test TrustedTypes.createPolicy behaviour.
+  const id = x => x;
+  const a_policy = {
+    createHTML: id,
+    createScriptURL: id,
+    createURL: id,
+    createScript: id,
+  };
+
+  const scriptyPolicy = TrustedTypes.createPolicy('allowEval', a_policy);
+
+  // Provoke/wait for a CSP violation, in order to be sure that all previous
+  // CSP violations have been delivered.
+  function promise_flush() {
+    return promise_violation("plugin-types bla/blubb");
+  }
+  function flush() {
+   expect_throws(_ => {
+      var o = document.createElement('object');
+      o.type = "application/x-shockwave-flash";
+      document.body.appendChild(o);
+    });
+  }
+
+  window.script_run_beacon = 'never_overwritten';
+
+  promise_test(t => {
+    let p = Promise.resolve()
+        .then(promise_violation("trusted-types *"))
+        .then(promise_flush());
+    expect_throws(_ => eval('script_run_beacon="should not run"'));
+    assert_equals(script_run_beacon, 'never_overwritten');
+    flush();
+    return p;
+  }, "Trusted Type violation report: evaluating a string.");
+
+  promise_test(t => {
+    let p = promise_flush()();
+    eval(scriptyPolicy.createScript('script_run_beacon="i ran"'));
+    flush();
+    assert_equals(script_run_beacon, 'i ran');
+    return p;
+  }, "Trusted Type violation report: evaluating a Trusted Script.");
+
+  promise_test(t => {
+    TrustedTypes.createPolicy('default', {
+      createScript: s => s.replace('payload', 'default policy'),
+    }, true);
+    let p = promise_flush()();
+    eval('script_run_beacon="payload"');
+    assert_equals(script_run_beacon, 'default policy');
+    flush();
+    return p;
+  }, "Trusted Type violation report: default policy transforms the script before CSP checks runs.");
+
+  </script>
+</body>
diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting.tentative.https.html.headers b/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting.tentative.https.html.headers
new file mode 100644
index 00000000000..2e935f73a48
--- /dev/null
+++ b/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting.tentative.https.html.headers
@@ -0,0 +1,4 @@
+Content-Security-Policy: trusted-types *
+Content-Security-Policy: script-src http: https: 'nonce-123' 'unsafe-eval'
+Content-Security-Policy: plugin-types bla/blubb
+
diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_viewer_availability.https.html b/tests/wpt/web-platform-tests/webxr/xrSession_viewer_availability.https.html
index 686859166fe..c509e5f1a2a 100644
--- a/tests/wpt/web-platform-tests/webxr/xrSession_viewer_availability.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrSession_viewer_availability.https.html
@@ -8,7 +8,7 @@
 <script>
 
   let testName =
-    "Inline viewer support wtih no device";
+    "Inline viewer support with no device";
 
   // Purposefully not connecting a device to ensure that viewer is always
   // supported if that is the only feature requested.
@@ -16,33 +16,65 @@
     (t) => {
     function session_resolves(sessionMode, sessionInit) {
       return navigator.xr.requestSession(sessionMode, sessionInit)
-        .then((session) => {
-          return session.end();
+        .then(session => session.end());
+    }
+
+    function session_rejects(expected, sessionMode, sessionInit) {
+      return promise_rejects(t, expected, navigator.xr.requestSession(sessionMode, sessionInit)
+        .then(session => session.end()));
+    }
+
+    function simulate_user_activation(func) {
+      return new Promise((resolve, reject) => {
+        navigator.xr.test.simulateUserActivation(() => {
+          try { resolve(func()); } catch(e) { reject(e); }
         });
+      });
     }
 
-    // RequestSession with explicit request for the viewer space should succeed.
     return session_resolves('inline', {
+      // RequestSession with 'viewer' as a required featre should succeed, even
+      // without user activation.
       requiredFeatures: ['viewer']
     })
     .then(() => {
+      // RequestSession with 'viewer' as an optional feature should succeed, even
+      // without user activation.
+      return session_resolves('inline', {
+        optionalFeatures: ['viewer']
+      })
+    })
+    .then(() => {
       // RequestSession with no requirements should succeed.
       return session_resolves('inline', {});
     })
     .then(() => {
+      // RequestSession with non-viewer optional features should fail
+      // without user activation.
+      return session_rejects("SecurityError", 'inline', {
+        optionalFeatures: ['local']
+      });
+    })
+    .then(() => {
+      // RequestSession with non-viewer required features should fail
+      // without user activation.
+      return session_rejects("SecurityError", 'inline', {
+        optionalFeatures: ['local']
+      });
+    })
+    .then(() => simulate_user_activation(() => {
       // RequestSession with unsupported optional features should succeed.
       return session_resolves('inline', {
         requiredFeatures: ['viewer'],
         optionalFeatures: ['local']
       })
-    })
-    .then(() => {
+    }))
+    .then(() => simulate_user_activation(() => {
       // Request with unsupported required features should reject.
-      return promise_rejects(t, "NotSupportedError",
-        navigator.xr.requestSession('inline', {
+      return session_rejects("NotSupportedError", 'inline', {
           requiredFeatures: ['local']
-        }));
-    });
+      });
+    }));
   });
 
 </script>